rpms/cairo-java/devel cairo-java.spec,1.46,1.47

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

Author: kasal

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

Modified Files:
	cairo-java.spec 
Log Message:
- Remove the name_base, java_pkg_prefix, and c_pkg_prefix cruft.
- Repeat the main pkg description in -devel description.
- -devel should require pkgconfig
- add dash to the jar name (between name and version)
- Resolves: #192881


Index: cairo-java.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cairo-java.spec	20 Apr 2007 17:36:38 -0000	1.46
+++ cairo-java.spec	1 Feb 2008 12:10:36 -0000	1.47
@@ -1,32 +1,18 @@
-# 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}}
-
-%define	name_base	cairo-java
-
 Summary:	Java bindings for the Cairo library
-Name:		%{java_pkg_prefix}%{name_base}
+Name:		cairo-java
 Version:	1.0.5
-Release: 	8%{?dist}
+Release: 	9%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/1.0/%{name_base}-%{version}.tar.bz2
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-gjavah.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	fontconfig >= 2.3.1
-Requires: 	%{java_pkg_prefix}cairo >= 1.0.0
-Requires: 	%{java_pkg_prefix}glib-java >= 0.2.6
-BuildRequires:	%{java_pkg_prefix}glib-java-devel >= 0.2.6
+Requires: 	cairo >= 1.0.0
+Requires: 	glib-java >= 0.2.6
+BuildRequires:	glib-java-devel >= 0.2.6
 BuildRequires:	fontconfig-devel >= 2.3.1
 BuildRequires:	cairo-devel >= 1.0.0
 BuildRequires:	gcc-java >= 3.3.3
@@ -44,24 +30,22 @@
 Requires:	cairo-devel
 Requires:	fontconfig-devel
 Requires:	glib-java-devel
+Requires:	pkgconfig
 
 %description    devel
+Cairo-java is a language binding that allows developers to write Cairo
+applications in Java.  It is part of Java-GNOME.
+
 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.
 # 2) libtool does not use pic_flag when compiling, so we have to force it.
@@ -81,21 +65,18 @@
 
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
-# 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)
 
 
 %post -p /sbin/ldconfig
@@ -121,6 +102,13 @@
 
 
 %changelog
+* Fri Feb  1 2008 Stepan Kasal <skasal at redhat.com> - 1.0.5-9
+- Remove the name_base, java_pkg_prefix, and c_pkg_prefix cruft.
+- Repeat the main pkg description in -devel description.
+- -devel should require pkgconfig
+- add dash to the jar name (between name and version)
+- Resolves: #192881
+
 * Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 1.0.5-8
 - Adhere to packaging guidelines.
 - Resolves: #225636