rpms/glib-java/devel glib-java.spec,1.59,1.60

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

Author: kasal

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

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


Index: glib-java.spec
===================================================================
RCS file: /cvs/extras/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- glib-java.spec	6 Nov 2007 13:08:07 -0000	1.59
+++ glib-java.spec	6 Nov 2007 13:39:08 -0000	1.60
@@ -1,61 +1,46 @@
-# install these packages into /opt if we have a prefix defined for the
-# java packages
-%{?java_pkg_prefix: %define _prefix /opt/frysk }
-%{?java_pkg_prefix: %define _sysconfdir %{_prefix}/etc }
-%{?java_pkg_prefix: %define _localstatedir %{_prefix}/var }
-%{?java_pkg_prefix: %define _infodir %{_prefix}/share/info }
-%{?java_pkg_prefix: %define _mandir %{_prefix}/share/man }
-%{?java_pkg_prefix: %define _defaultdocdir %{_prefix}/share/doc }
-
-%{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
-%{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
-
-# The prefix for java-gnome package names
-%define name_base glib-java
 Summary:	Base Library for the Java-GNOME libraries 
-Name:		%{java_pkg_prefix}%{name_base}
+Name:		glib-java
 Version:	0.2.6
-Release:	10%{?dist}
+Release:	11%{?dist}
 URL:		http://java-gnome.sourceforge.net
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-gjavah.patch
 License:	LGPL
 Group:		Development/Libraries
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	/sbin/ldconfig
-Requires:	%{c_pkg_prefix}glib2 >= 2.7.0
-BuildRequires:	java-devel >= 1.4.2 %{c_pkg_prefix}glib2-devel >= 2.7.0
+Requires:	glib2 >= 2.7.0
+BuildRequires:	java-devel >= 1.4.2 glib2-devel >= 2.7.0
 BuildRequires:	gcc-java >= 4.1.1, docbook-utils
 BuildRequires:	pkgconfig
 
 %description 
-Glib-java is a base framework for the Java-GNOME libraries. Allowing the use of
-GNOME through Java.
+Glib-java is a base framework for the Java-GNOME libraries.  Allowing the use
+of GNOME through Java.
 
 %package        devel
 Summary:	Compressed Java source files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel
+Requires:	pkgconfig
 
 %description    devel
+Glib-java is a base framework for the Java-GNOME libraries.  Allowing the use
+of GNOME through Java.
+
 Development part of %{name}.
 
 
 %prep
-%setup -q -n %{name_base}-%{version}
+%setup -q -n %{name}-%{version}
 
 %patch0 -p0
 touch aclocal.m4
 touch configure Makefile.in
 
 %build
-# if either the C or Java packages has a prefix declared, then we will
-# add /opt/frysk/lib/pkgconfig to the pkgconfig path
-if  [  'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
-	export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig
-fi
 
 # Two workarounds:
 # 1) libtool.m4 calls gcj with $CFLAGS and gcj seems to choke on -Wall.
@@ -76,21 +61,18 @@
 
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
-# 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} | 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
@@ -109,20 +91,27 @@
 %{_libdir}/libglibjava-*.so
 %{_libdir}/libglibjni-*.so
 %{_datadir}/java/*.jar
-%dir %{_datadir}/%{name_base}
-%{_datadir}/%{name_base}/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 
 %files devel
 %defattr(-,root,root)
 %doc doc/api
-%dir %{_includedir}/%{name_base}
-%{_includedir}/%{name_base}/*
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*
 %{_libdir}/libglibjava.so
 %{_libdir}/libglibjni.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Nov  6 2007 Stepan Kasal <skasal at redhat.com> - 0.2.6-11
+- -devel should require pkgconfig
+- remove the dances with %%{java_pkg_prefix} and name_base
+- cosmetic change to the descriptions
+- add dash to the jar name (between name and version)
+- Resolves: #192881
+
 * Mon Apr 23 2007 Stepan Kasal <skasal at redhat.com> - 0.2.6-10
 - Move /usr/include/glib-java/jg_jnu.h to devel.