rpms/libchamplain/devel .cvsignore, 1.3, 1.4 libchamplain.spec, 1.3, 1.4 sources, 1.3, 1.4

[Debarshi Ray]

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19179

Modified Files:
	.cvsignore libchamplain.spec sources 
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Mar 2009 20:47:42 -0000	1.3
+++ .cvsignore	13 Jul 2009 05:18:53 -0000	1.4
@@ -1 +1 @@
-libchamplain-0.2.9.tar.gz
+libchamplain-0.3.3.tar.gz


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libchamplain.spec	17 Mar 2009 20:47:42 -0000	1.3
+++ libchamplain.spec	13 Jul 2009 05:18:53 -0000	1.4
@@ -1,16 +1,19 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.2.9
+Version:	0.3.3
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
-URL:		http://blog.pierlux.com/projects/libchamplain/en/
-Source0:	http://libchamplain.pierlux.com/release/latest/%{name}-%{version}.tar.gz
+URL:		http://projects.gnome.org/libchamplain/
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/%{name}-%{version}.tar.gz
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: 	clutter-cairo-devel >= 0.8
-BuildRequires: 	libsoup-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
@@ -21,7 +24,7 @@ Summary:	Development files for %{name}
 Group:		Development/Libraries
 
 %if 0%{?fc10}
-Requires:	clutter-devel >= 0.8
+Requires:	clutter-devel
 Requires:	pkgconfig
 %endif
 
@@ -31,13 +34,37 @@ Requires:	%{name} = %{version}-%{release
 %description devel
 This package contains development files for %{name}.
 
+%package gtk
+Summary:	Gtk+ widget wrapper for %{name}
+Group:		System Environment/Libraries
+
+Requires:	%{name} = %{version}-%{release}
+
+%description gtk
+Libchamplain-gtk is a library providing a GtkWidget to embed %{name}
+into Gtk+ applications.
+
+%package gtk-devel
+Summary:	Development files for %{name}-gtk
+Group:		Development/Libraries
+
+%if 0%{?fc10}
+Requires:	gtk2-devel
+Requires:	pkgconfig
+%endif
+
+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
 
-sed --in-place --expression 's/^#include <config.h>//g' ./demos/launcher.c
-
 %build
-%configure --disable-static --enable-gtk-doc
+%configure --disable-static --enable-gtk --enable-gtk-doc
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -50,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
 
@@ -57,29 +87,54 @@ 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
 %doc ChangeLog
 %doc COPYING
 %doc NEWS
-%{_libdir}/%{name}-0.2.so.*
-
-%dir %{_datadir}/champlain
-%{_datadir}/champlain/error.svg
+%{_libdir}/%{name}-0.3.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%doc demos/animated-marker.c
 %doc demos/launcher.c
-%{_libdir}/%{name}-0.2.so
-%{_libdir}/pkgconfig/champlain-0.2.pc
+%doc demos/polygons.c
+%{_libdir}/%{name}-0.3.so
+%{_libdir}/pkgconfig/champlain-0.3.pc
 
 %dir %{_datadir}/gtk-doc/html/libchamplain
 %doc %{_datadir}/gtk-doc/html/libchamplain/*
 
-%dir %{_includedir}/%{name}-0.2
-%{_includedir}/%{name}-0.2/champlain
+%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-gtk.c
+%doc demos/markers.c
+%{_libdir}/%{name}-gtk-0.3.so
+%{_libdir}/pkgconfig/champlain-gtk-0.3.pc
+
+%dir %{_datadir}/gtk-doc/html/libchamplain-gtk
+%doc %{_datadir}/gtk-doc/html/libchamplain-gtk/*
+
+%dir %{_includedir}/%{name}-gtk-0.3
+%{_includedir}/%{name}-gtk-0.3/champlain-gtk
 
 %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.
   * Fixed elastic effect.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Mar 2009 20:47:42 -0000	1.3
+++ sources	13 Jul 2009 05:18:53 -0000	1.4
@@ -1 +1 @@
-8c1f4ccf31ac8d5351db7e0f734d3e63  libchamplain-0.2.9.tar.gz
+06f30890b86bf9fc4791fe9a4cb110e1  libchamplain-0.3.3.tar.gz