[dom4j/f18] Cleanup source tarball from non-free content

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon Oct 29 16:04:49 UTC 2012


commit c03e652c86237a421b3b0b009008de5b1b55c24f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Oct 29 16:50:35 2012 +0100

    Cleanup source tarball from non-free content
    
    - Resolves: rhbz#848875

 cleanup-sources.sh |   12 ++++++++++++
 dom4j.spec         |   10 ++++++----
 sources            |    2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/cleanup-sources.sh b/cleanup-sources.sh
new file mode 100755
index 0000000..aaf7fb9
--- /dev/null
+++ b/cleanup-sources.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -C -e
+
+name=dom4j
+version=$(awk '/Version:/{print$2}' ${name}.spec)
+url=http://downloads.sourceforge.net/${name}/${name}-${version}.tar.gz
+
+set -x
+wget ${url} -O ${name}-${version}.tar.gz
+tar xf ${name}-${version}.tar.gz
+find ${name}-${version} -name \*.jar -delete
+tar caf ${name}-${version}-clean.tar.xz ${name}-${version}
diff --git a/dom4j.spec b/dom4j.spec
index 7b37b0f..9d5692d 100644
--- a/dom4j.spec
+++ b/dom4j.spec
@@ -31,12 +31,12 @@
 Summary:        Open Source XML framework for Java
 Name:           dom4j
 Version:        1.6.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Epoch:          0
 License:        BSD
 URL:            http://www.dom4j.org/
 Group:          Development/Libraries
-Source0:        http://downloads.sourceforge.net/dom4j/dom4j-1.6.1.tar.gz
+Source0:        %{name}-%{version}-clean.tar.xz
 Source1:        dom4j_rundemo.sh
 Patch0:         dom4j-1.6.1-build_xml.patch
 BuildRequires:  jpackage-utils >= 0:1.6
@@ -104,8 +104,6 @@ Javadoc for %{name}.
 %setup -q 
 # replace run.sh
 cp -p %{SOURCE1} run.sh
-# remove binary libs
-find . -name "*.jar" -exec rm -f {} \;
 # fix for deleted jars
 mv build.xml build.xml.orig
 sed -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml.orig > build.xml
@@ -192,6 +190,10 @@ install -m 755 run.sh $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}
 
 %changelog
+* Mon Oct 29 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.6.1-11
+- Cleanup source tarball from non-free content
+- Resolves: rhbz#848875
+
 * Fri Oct 12 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.6.1-10
 - Disable test dependencies because tests are skipped
 
diff --git a/sources b/sources
index 1b99e98..784593f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e7ef6d20939315714de4a8502f27b2d  dom4j-1.6.1.tar.gz
+6cf999ada54c096f0330aef5b38b8ca5  dom4j-1.6.1-clean.tar.xz


More information about the scm-commits mailing list