rpms/libchamplain/F-11 libchamplain.spec,1.4,1.5

[Debarshi Ray]

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18656

Modified Files:
	libchamplain.spec 
Log Message:
* Sat Jul 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.3-1
- Version bump to 0.3.3.
- Added 'BuildRequires: chrpath' for removing rpaths.



Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-11/libchamplain.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libchamplain.spec	11 Jul 2009 13:22:59 -0000	1.4
+++ libchamplain.spec	13 Jul 2009 05:17:17 -0000	1.5
@@ -7,14 +7,13 @@ Group:		System Environment/Libraries
 URL:		http://projects.gnome.org/libchamplain/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/%{name}-%{version}.tar.gz
 
-Patch0:		foo.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: 	clutter-cairo-devel
-BuildRequires: 	clutter-gtk-devel
-BuildRequires: 	libsoup-devel
-BuildRequires: 	sqlite-devel
+BuildRequires:	chrpath
+BuildRequires:	clutter-cairo-devel
+BuildRequires:	clutter-gtk-devel
+BuildRequires:	libsoup-devel
+BuildRequires:	sqlite-devel
 
 %description
 Libchamplain is a C library aimed to provide a ClutterActor to display
@@ -56,21 +55,17 @@ Requires:	pkgconfig
 
 Requires:	gtk-doc
 Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-gtk = %{version}-%{release}
 
 %description gtk-devel
 This package contains development files for %{name}-gtk.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-static --enable-gtk --enable-gtk-doc
 
-# Remove rpaths.
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
@@ -82,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
+# Remove rpaths.
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.3.so.1.0.0
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+%post gtk -p /sbin/ldconfig
+
+%postun gtk -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS
@@ -97,12 +99,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS
 %{_libdir}/%{name}-0.3.so.*
 
-#%dir %{_datadir}/champlain
-#%{_datadir}/champlain/error.svg
-
 %files devel
 %defattr(-,root,root,-)
+%doc demos/animated-marker.c
 %doc demos/launcher.c
+%doc demos/polygons.c
 %{_libdir}/%{name}-0.3.so
 %{_libdir}/pkgconfig/champlain-0.3.pc
 
@@ -112,9 +113,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/%{name}-0.3
 %{_includedir}/%{name}-0.3/champlain
 
+%files gtk
+%defattr(-,root,root,-)
+%{_libdir}/%{name}-gtk-0.3.so.*
+
 %files gtk-devel
 %defattr(-,root,root,-)
-%doc demos/launcher.c
+%doc demos/launcher-gtk.c
+%doc demos/markers.c
 %{_libdir}/%{name}-gtk-0.3.so
 %{_libdir}/pkgconfig/champlain-gtk-0.3.pc
 
@@ -127,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sat Jul 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.3-1
 - Version bump to 0.3.3.
+- Added 'BuildRequires: chrpath' for removing rpaths.
 
 * Wed Mar 18 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.2.9-1
 - Version bump to 0.2.9.