rpms/libvte-java/FC-5 libvte-java.spec,1.15,1.16

[fedora-cvs-commits at redhat.com]

Author: skasal

Update of /cvs/dist/rpms/libvte-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20253

Modified Files:
	libvte-java.spec 
Log Message:
Synch with devel.


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/FC-5/libvte-java.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libvte-java.spec	15 Aug 2006 13:25:35 -0000	1.15
+++ libvte-java.spec	31 Oct 2006 09:34:27 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.12.1
-Release:   2%{?dist}
+Release:   5%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
@@ -48,14 +48,12 @@
 make %{?_smp_mflags}
 
 # pack up the java source
-jarversion=$(echo -n %{version} | cut -d . -f -2)
-jarname=$(echo -n %{name} | cut -d - -f 1 | sed "s/^lib//")
-zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
-pushd src/java
-find -name \*.java | xargs touch --date=1/1/1970
-zip -X -9 -r $zipfile . -i \*.java
-popd
+find src/java -name \*.java -newer ChangeLog | xargs touch -r ChangeLog
+(cd src/java && find . -name \*.java | sort | xargs zip -X -9 src.zip)
+touch -r ChangeLog src/java/src.zip
 
+# fix up the modification date of generated documentation
+find doc -type f -newer ChangeLog | xargs touch -r ChangeLog
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,13 +65,16 @@
 	mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{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} | cut -d - -f 1 | sed "s/^lib//")
-install -m 644 $jarname$jarversion-src-%{version}.zip $RPM_BUILD_ROOT%{_datadir}/java/
-pushd $RPM_BUILD_ROOT%{_datadir}/java
-ln -sf $jarname$jarversion-src-%{version}.zip $jarname$jarversion-src.zip
-popd
+jarname=$(echo -n %{name_base} | sed 's/-.*//;s/^lib//')
+zipfile=$jarname$jarversion-src-%{version}.zip
+install -m 644 src/java/src.zip $RPM_BUILD_ROOT%{_datadir}/java/$zipfile
+(cd $RPM_BUILD_ROOT%{_datadir}/java &&
+  ln -sf $zipfile $jarname$jarversion-src.zip)
 
 
 %clean
@@ -84,17 +85,32 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/api AUTHORS ChangeLog COPYING INSTALL NEWS README 
-%{_libdir}/*so*
-%{_libdir}/*la
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README 
+%{_libdir}/libvtejava-*.so
+%{_libdir}/libvtejni-*.so
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%doc doc/api
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libvtejava.so
+%{_libdir}/libvtejni.so
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Oct 17 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-5
+- Fix multilib conflicts in %%{docdir}. (#210575)
+- Move development documentation to -devel.
+
+* Thu Oct  5 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-4
+- Fix the source packing: preserve source timestamps and prevent multilib
+  conflicts. (#192716)
+
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-3
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+
 * Tue Aug 15 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-2
 - Add libvte-java-alias.patch, which reimplements the old methods,
   with a typo in their name.