packages: java-itext/java-itext.spec - updated deps

[glen]

Author: glen                         Date: Sun Oct 23 17:26:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated deps

---- Files affected:
packages/java-itext:
   java-itext.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/java-itext/java-itext.spec
diff -u packages/java-itext/java-itext.spec:1.3 packages/java-itext/java-itext.spec:1.4
--- packages/java-itext/java-itext.spec:1.3	Sun Oct 23 16:36:43 2011
+++ packages/java-itext/java-itext.spec	Sun Oct 23 19:26:39 2011
@@ -1,4 +1,9 @@
 # $Revision$, $Date$
+# OTOD
+# - javadoc fetches from net:
+#  [javadoc] Constructing Javadoc information...
+#  [javadoc] javadoc: warning - Error fetching URL: http://www.dom4j.org/apidocs/package-list
+#  [javadoc] javadoc: warning - Error fetching URL: https://pdf-renderer.dev.java.net/nonav/demos/latest/javadoc/package-list
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
@@ -44,19 +49,19 @@
 Patch3:		itext-xmloutput.patch
 BuildRequires:	ImageMagick
 BuildRequires:	ant
-BuildRequires:	bouncycastle-tsp
 BuildRequires:	desktop-file-utils
+BuildRequires:	java-bctsp
 BuildRequires:	java-dom4j
-BuildRequires:	jdk >= 1.7
+BuildRequires:	java-pdf-renderer
+BuildRequires:	jdk >= 1.6
 BuildRequires:	jpackage-utils
-BuildRequires:	pdf-renderer
 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:	java-bctsp
 Requires:	jpackage-utils >= 1.5
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,7 +93,7 @@
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Requires:	java-dom4j
-Requires:	pdf-renderer
+Requires:	java-pdf-renderer
 
 %description rups
 iText RUPS is a tool that combines SUN's PDF Renderer (to view PDF
@@ -148,11 +153,9 @@
 # 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
+build-jar-repository -s -p lib bcprov bcmail bctsp pdf-renderer dom4j
 
-#CLASSPATH=$(build-classpath bcprov bcmail bctsp pdf-renderer dom4j)
-CLASSPATH=$(build-classpath dom4j)
+CLASSPATH=$(build-classpath bcprov bcmail bctsp pdf-renderer dom4j)
 cd src
 %ant jar jar.rups jar.rtf jar.toolbox %{?with_javadoc:javadoc}
 
@@ -192,7 +195,7 @@
 # javadoc
 %if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -a build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
@@ -204,8 +207,8 @@
 
 %postun rups
 if [ $1 -eq 0 ] ; then
-    %update_icon_cache_post hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+	%update_icon_cache_post hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans rups
@@ -216,8 +219,8 @@
 
 %postun toolbox
 if [ $1 -eq 0 ] ; then
-    %update_icon_cache_post hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+	%update_icon_cache_post hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans toolbox
@@ -240,8 +243,8 @@
 %files rups
 %defattr(644,root,root,755)
 %doc src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
-%{_javadir}/%{pname}-rups.jar
-%{_javadir}/%{pname}-rups-%{version}.jar
+%{_javadir}/%{srcname}-rups.jar
+%{_javadir}/%{srcname}-rups-%{version}.jar
 %attr(755,root,root) %{_bindir}/%{pname}-rups
 %{_desktopdir}/%{pname}-rups.desktop
 %{_iconsdir}/hicolor/128x128/apps/%{pname}-rups.png
@@ -268,6 +271,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/10/23 17:26:39  glen
+- updated deps
+
 Revision 1.3  2011/10/23 14:36:43  glen
 - BR java-dom4j, other fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-itext/java-itext.spec?r1=1.3&r2=1.4&f=u