rpms/libvte-java/devel libvte-java.spec,1.32,1.33

[Štěpán Kasal (kasal)]

Author: kasal

Update of /cvs/extras/rpms/libvte-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32593

Modified Files:
	libvte-java.spec 
Log Message:
- -devel should require pkgconfig
- remove the residuum from %{java_pkg_prefix} and name_base
- cosmetic change to the descriptions
- add dash to the jar name (between name and version)
- Resolves: #232934


Index: libvte-java.spec
===================================================================
RCS file: /cvs/extras/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libvte-java.spec	20 Apr 2007 17:30:02 -0000	1.32
+++ libvte-java.spec	6 Nov 2007 15:59:24 -0000	1.33
@@ -1,9 +1,9 @@
 Summary:	Wrapper library for GNOME VTE
 Name:		libvte-java 
 Version:	0.12.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 URL:		http://java-gnome.sourceforge.net
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.12/%{name}-%{version}.tar.bz2
 License:	LGPL
 Group:		Development/Libraries
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -28,8 +28,12 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	vte-devel, libgtk-java-devel
+Requires:	pkgconfig
 
 %description    devel
+libvte-java is a Java wrapper library for the GNOME VTE library, allowing
+access to the terminal widget from Java.
+
 Development part of %{name}.
 
 
@@ -62,21 +66,18 @@
 
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install 
 
-# rename doc dir to reflect package rename, if the names differ
-if [ 'x%{name}' != 'x%{name}' ] ; then
-	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_base} | sed 's/-.*//;s/^lib//')
-zipfile=$jarname$jarversion-src-%{version}.zip
+jarversion=$(expr '%{version}' : '\([^.]*\.[^.]*\)')
+jarname=%{name}
+jarname=${jarname%%-*}
+zipname=${jarname#lib}-$jarversion-src
+zipfile=$zipname-%{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)
+  ln -sf $zipfile $zipname.zip)
 
 # Is the NEWS file still empty?  See the file list below.
 test -f NEWS -a ! -s NEWS
@@ -105,6 +106,13 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Nov  6 2007 Stepan Kasal <skasal at redhat.com> - 0.12.1-10
+- -devel should require pkgconfig
+- remove the residuum from %%{java_pkg_prefix} and name_base
+- cosmetic change to the descriptions
+- add dash to the jar name (between name and version)
+- Resolves: #232934 
+
 * Tue Apr  3 2007 Stepan Kasal <skasal at redhat.com> - 0.12.1-9
 - Fix permissions for libvte-java-alias.patch; because of CVS limitations,
   the patch has to be renamed, say to libvte-java-alias2.patch