SPECS: pdflib.spec - added java package, kill static modules

[qboosh]

Author: qboosh                       Date: Fri Oct 27 20:16:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added java package, kill static modules

---- Files affected:
SPECS:
   pdflib.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: SPECS/pdflib.spec
diff -u SPECS/pdflib.spec:1.67 SPECS/pdflib.spec:1.68
--- SPECS/pdflib.spec:1.67	Sat Mar 12 13:32:37 2005
+++ SPECS/pdflib.spec	Fri Oct 27 22:16:14 2006
@@ -1,12 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	java
-#
-# TODO:
-#		- java pkg.
-#
-%undefine	with_java
+%bcond_without	java	# Java binding
 #
 %include	/usr/lib/rpm/macros.perl
 Summary:	Portable C library for dynamically generating PDF files
@@ -28,7 +23,7 @@
 %{?with_java:BuildRequires:	jdk >= 1.4}
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool >= 0:1.4.2-9
+BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	python-modules >= 2.2
@@ -54,7 +49,7 @@
 
 %package devel
 Summary:	Header file for pdflib
-Summary(pl):	Pliki nagłówkowe dla %{name}
+Summary(pl):	Pliki nagłówkowe biblioteki pdflib
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -66,12 +61,36 @@
 Pakiet zawiera pliki potrzebne do kompilacji programów używających
 biblioteki PDF.
 
+%package static
+Summary:	Static pdflib library
+Summary(pl):	Statyczna biblioteka pdflib
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static pdflib library.
+
+%description static -l pl
+Statyczna biblioteka pdflib.
+
+%package java
+Summary:	Java bindings for pdflib
+Summary(pl):	Dowiązania Javy do pdflib
+Group:		Development/Languages/Java
+Requires:	%{name} = %{version}-%{release}
+
+%description java
+Java bindings for pdflib.
+
+%description java -l pl
+Dowiązania Javy do pdflib.
+
 %package perl
 Summary:	Perl bindings for pdflib
 Summary(pl):	Dowiązania Perla do pdflib
 Group:		Development/Languages/Perl
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-perl5
+Obsoletes:	pdflib-perl5
 
 %description perl
 Perl bindings for pdflib.
@@ -84,7 +103,7 @@
 Summary(pl):	Dowiązania Tcl do pdflib
 Group:		Development/Languages/Tcl
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-tcl8.0
+Obsoletes:	pdflib-tcl8.0
 
 %description tcl
 Tcl bindings for pdflib.
@@ -98,7 +117,7 @@
 Group:		Development/Languages/Python
 Requires:	%{name} = %{version}-%{release}
 %pyrequires_eq	python
-Obsoletes:	%{name}-python1.5
+Obsoletes:	pdflib-python1.5
 
 %description python
 Python bindings for pdflib.
@@ -106,18 +125,6 @@
 %description python -l pl
 Dowiązania pythona dla pdflib.
 
-%package static
-Summary:	Static libraries for pdflib
-Summary(pl):	Statyczna biblioteka pdflib
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static libraries for pdflib.
-
-%description static -l pl
-Statyczna biblioteka pdflib.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -133,7 +140,8 @@
 	--enable-cxx \
 	--enable-shared-pdflib \
 	--with%{!?with_java:out}-java \
-	--with-py=%{py_sitedir} --with-pyincl=%{py_incdir} \
+	--with-py=%{py_sitedir} \
+	--with-pyincl=%{py_incdir} \
 	--with-perl=%{__perl} \
 	--with-perlincl=%{perl_archlib}/CORE \
 	--with-tcl=%{_bindir}/tclsh \
@@ -142,7 +150,7 @@
 	--with-pnglib \
 	--with-tifflib
 
-%{__make} CPPFLAGS="$CPPFLAGS"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -150,7 +158,15 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install ./bind/cpp/pdflib.hpp $RPM_BUILD_ROOT%{_includedir}
+install bind/cpp/pdflib.hpp $RPM_BUILD_ROOT%{_includedir}
+
+%if %{with java}
+install -d $RPM_BUILD_ROOT%{_javadir}
+install bind/java/pdflib.jar $RPM_BUILD_ROOT%{_javadir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpdf_java.{la,a}
+%endif
+
+rm -f $RPM_BUILD_ROOT{%{perl_vendorarch},%{_libdir}/tcl*/pdflib,%{py_libdir}/lib-dynload}/pdflib*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -158,6 +174,9 @@
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post	java -p /sbin/ldconfig
+%postun	java -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc readme.txt doc/{changes,compatibility,readme_unix}.txt
@@ -173,6 +192,18 @@
 %{_includedir}/pdflib.h
 %{_includedir}/pdflib.hpp
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libpdf.a
+
+%if %{with java}
+%files java
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpdf_java.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpdf_java.so
+%{_javadir}/pdflib.jar
+%endif
+
 %files perl
 %defattr(644,root,root,755)
 %{perl_vendorarch}/pdflib_pl.pm
@@ -180,6 +211,7 @@
 
 %files tcl
 %defattr(644,root,root,755)
+%dir %{_libdir}/tcl*/pdflib
 %attr(755,root,root) %{_libdir}/tcl*/pdflib/pdflib_tcl.so.*
 %{_libdir}/tcl*/pdflib/pkgIndex.tcl
 
@@ -187,19 +219,15 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_libdir}/lib-dynload/pdflib_py.so.*
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libpdf.a
-%{perl_vendorarch}/pdflib_pl.a
-%{_libdir}/tcl*/pdflib/pdflib_tcl.a
-%{py_libdir}/lib-dynload/pdflib_py.a
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2006/10/27 20:16:14  qboosh
+- added java package, kill static modules
+
 Revision 1.67  2005/03/12 12:32:37  troll
 - mass commit: remove obsolete BR: rpm-pythonprov
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pdflib.spec?r1=1.67&r2=1.68&f=u