From ea0bf49954fc53cd5746eb6220f2b1ba93527112 Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Jan 27 2005 17:36:37 +0000
Subject: Remove non-distributable files from the source tarball


---

diff --git a/.cvsignore b/.cvsignore
index 6fcbb4c..65adcb6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
 jss34.jar
-ldapsdk_java_20020819.tar.gz
+ldapsdk_java_20020819_clean.tar.gz
 ldapjdk-4.17
 noarch
 *.src.rpm
diff --git a/ldapjdk.spec b/ldapjdk.spec
index aff7816..f1de186 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -3,7 +3,7 @@
 %define version		4.17
 %define tar_name	ldapsdk_java
 %define tar_version	20020819
-%define release		1jpp_1fc
+%define release		1jpp_2fc
 %define section		free
 %define use_nonfree	%{?_with_nonfree:1}%{!?_without_nonfree:0}
 
@@ -15,7 +15,11 @@ Summary: 	The Mozilla LDAP Java SDK
 License:	MPL
 Group:		Development/Java
 URL:		http://www.mozilla.org/directory/javasdk.html
-Source0:	ftp://ftp.mozilla.org/pub/directory/java-sdk/%{tar_name}_%{tar_version}.tar.gz
+# This tarball is made by taking the upstream one from
+# ftp://ftp.mozilla.org/pub/directory/java-sdk/ and
+# deleting mozilla/directory/java-sdk/ldap{jdk,sp}/lib
+# as they contain non-distributable jars.
+Source0:	%{tar_name}_%{tar_version}_clean.tar.gz
 # FIXME: A jpackage must be created for the
 # Mozilla Network Security Services for Java (JSS)
 Source2:        jss34.jar
@@ -66,8 +70,8 @@ fi
 %build
 # cleanup CVS dirs
 rm -fr $(find . -name CVS -type d)
-# cleanup jars
-rm -fr $(find . -name "*.jar"  -type f)
+# make sure there are no proprietary jars here
+[ `find . -name "*.jar" -type f | wc -l` = 0 ] || exit 1
 mv mozilla/directory/* .
 rm -fr mozilla
 
@@ -130,7 +134,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
-* Fri Jan 21 2005 Gary Benson <gbenson@redhat.com> 0:4.17-1jpp_1rh
+* Thu Jan 27 2005 Gary Benson <gbenson@redhat.com> 0:4.17-1jpp_2fc
+- Remove non-distributable files from the source tarball.
+
+* Fri Jan 21 2005 Gary Benson <gbenson@redhat.com> 0:4.17-1jpp_1fc
 - Build into Fedora.
 
 * Tue Nov 16 2004 Fernando Nasser <fnasser@redhat.com> 0:4.17-1jpp_1rh
diff --git a/sources b/sources
index 7bdaaa5..e737609 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 e25a48d3c992a713a9d1b7b90673e90d  jss34.jar
-f0eef8fc5c4961cdebdd9b9188228431  ldapsdk_java_20020819.tar.gz
+d9102f81368b5ab9fa49708182c31da2  ldapsdk_java_20020819_clean.tar.gz