Author: glen Date: Sun Oct 23 14:36:48 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- BR java-dom4j, other fixes
---- Files affected:
packages/java-itext:
java-itext.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/java-itext/java-itext.spec
diff -u packages/java-itext/java-itext.spec:1.2
packages/java-itext/java-itext.spec:1.3
--- packages/java-itext/java-itext.spec:1.2 Sun Oct 23 00:59:02 2011
+++ packages/java-itext/java-itext.spec Sun Oct 23 16:36:43 2011
@@ -5,6 +5,7 @@
%define srcname iText
%define pname itext
+%include /usr/lib/rpm/macros.java
Summary: A Free Java-PDF library
Name: java-%{pname}
Version: 2.1.7
@@ -45,12 +46,15 @@
BuildRequires: ant
BuildRequires: bouncycastle-tsp
BuildRequires: desktop-file-utils
-BuildRequires: dom4j
+BuildRequires: java-dom4j
BuildRequires: jdk >= 1.7
BuildRequires: jpackage-utils
-BuildRequires: jpackage-utils
BuildRequires: pdf-renderer
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.553
+%if %(locale -a | grep -q '^en_US$'; echo $?)
+BuildRequires: glibc-localedb-all
+%endif
Requires: bouncycastle-tsp
Requires: java >= 1.5
Requires: jpackage-utils >= 1.5
@@ -120,16 +124,12 @@
%patch3 -p0
# Remove preshipped binaries
-find -name "*.jar" | xargs rm -v
+find -name "*.jar" | xargs -r rm -v
# Fix encoding issues
-sed 's/\r//' src/rups/com/lowagie/rups/view/icons/copyright_notice.txt >
tmpfile
-touch -r src/rups/com/lowagie/rups/view/icons/copyright_notice.txt tmpfile
-mv -f tmpfile src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
+%undos src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
install -d lib
-build-jar-repository -s -p lib bcprov bcmail bctsp pdf-renderer dom4j
-
# Remove jdk & version numbers from classpath entries
for file in src/ant/{*,.ant*}; do
for jarname in bcmail bcprov bctsp dom4j; do
@@ -145,9 +145,16 @@
sed -i 's|debug="true"||g' src/ant/compile.xml
%build
-export CLASSPATH=$(build-classpath bcprov bcmail bctsp pdf-renderer dom4j)
+# source code not US-ASCII
+export LC_ALL=en_US
+
+#build-jar-repository -s -p lib bcprov bcmail bctsp pdf-renderer dom4j
+build-jar-repository -s -p lib dom4j
+
+#CLASSPATH=$(build-classpath bcprov bcmail bctsp pdf-renderer dom4j)
+CLASSPATH=$(build-classpath dom4j)
cd src
-%ant jar jar.rups jar.rtf jar.toolbox %{with_javadoc:javadoc}
+%ant jar jar.rups jar.rtf jar.toolbox %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT
@@ -261,6 +268,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2011/10/23 14:36:43 glen
+- BR java-dom4j, other fixes
+
Revision 1.2 2011/10/22 22:59:02 glen
- fetch src
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-itext/java-itext.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
