rpms/cairo-java/devel cairo-java.spec,1.37,1.38

[fedora-cvs-commits at redhat.com]

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7040

Modified Files:
	cairo-java.spec 
Log Message:
- Do not pack the *.la files.
- Move the *.so symlinks to -devel.
- Do not do `rm *.a'--there are not any.



Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cairo-java.spec	12 Aug 2006 17:25:00 -0000	1.37
+++ cairo-java.spec	30 Aug 2006 19:49:38 -0000	1.38
@@ -15,7 +15,7 @@
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	1.0.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -45,8 +45,7 @@
 Requires:	glib-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 
@@ -76,13 +75,15 @@
 rm -rf %{buildroot}
 
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
 	mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged files:
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/^lib//")
@@ -92,11 +93,8 @@
 popd
 
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -104,17 +102,24 @@
 %files
 %defattr(-,root,root)
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL README NEWS 
-%{_libdir}/*so* 
-%{_libdir}/*la
+%{_libdir}/libcairojava-*.so
+%{_libdir}/libcairojni-*.so
 %{_datadir}/java/*
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcairojava*.so
+%{_libdir}/libcairojni*.so
 %{_datadir}/java/*.zip
 
 
 %changelog
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 1.0.5-2
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+- Do not do `rm *.a'--there are not any.
+
 * Sat Aug 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.5-1
 - New upstream version.
 - Use the %%{?dist} tag.