packages (DEVEL): devhelp/devhelp.spec - up to 2.91.90 - use %{__rm} macro

[wiget]

Author: wiget                        Date: Thu Mar  3 19:10:13 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 2.91.90
- use %{__rm} macro

---- Files affected:
packages/devhelp:
   devhelp.spec (1.120 -> 1.120.2.1) 

---- Diffs:

================================================================
Index: packages/devhelp/devhelp.spec
diff -u packages/devhelp/devhelp.spec:1.120 packages/devhelp/devhelp.spec:1.120.2.1
--- packages/devhelp/devhelp.spec:1.120	Fri Feb  4 19:23:41 2011
+++ packages/devhelp/devhelp.spec	Thu Mar  3 20:10:08 2011
@@ -2,34 +2,32 @@
 Summary:	API documentation browser for GNOME
 Summary(pl.UTF-8):	Przeglądarka dokumentacji API dla GNOME
 Name:		devhelp
-Version:	2.32.0
-Release:	2
+Version:	2.91.90
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/devhelp/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5:	c6690a45609caa00ecd9cd92f7d28915
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/devhelp/2.91/%{name}-%{version}.tar.bz2
+# Source0-md5:	ae861cd89a84ad0c5fa695bf2f6c01d5
 Patch0:		%{name}-bookdir.patch
 URL:		http://www.imendio.com/projects/devhelp/
 BuildRequires:	GConf2-devel >= 2.24.0
-BuildRequires:	autoconf >= 2.60
-BuildRequires:	automake >= 1:1.9
-BuildRequires:	gettext-devel
+BuildRequires:	autoconf >= 2.64
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gtk+2-devel >= 2:2.14.0
-BuildRequires:	gtk-webkit-devel >= 1.1.13
+BuildRequires:	gtk+3-devel >= 3.0.0
+BuildRequires:	gtk-webkit3-devel >= 1.3.11
 BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libtool
-BuildRequires:	libunique-devel >= 1.0
-BuildRequires:	libwnck-devel >= 2.24.0
+BuildRequires:	libtool >= 2.2
 BuildRequires:	pkgconfig
-BuildRequires:	python
+BuildRequires:	python >= 2.3
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
-Requires(post,preun):	GConf2 >= 2.20.0
+Requires(post,preun):	GConf2 >= 2.24.0
 Requires:	%{name}-libs = %{version}-%{release}
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
@@ -57,8 +55,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Devhelp
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.14.0
-Requires:	libwnck-devel >= 2.24.0
+Requires:	gtk+3-devel >= 3.0.0
 
 %description devel
 Headers for Devhelp library.
@@ -84,6 +81,7 @@
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Requires:	gedit2
+Requires:	python-pygobject >= 2.27.91
 
 %description -n gedit2-plugin-devhelp
 Allows to browse API documentation in Gedit.
@@ -96,7 +94,7 @@
 %patch0 -p1
 
 sed -i -e 's/^en at shaw//' po/LINGUAS
-rm -f po/en at shaw.po
+%{__rm} po/en at shaw.po
 
 %build
 %{__intltoolize}
@@ -119,7 +117,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/%{name}/*.py
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*.py \
+	$RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
 
@@ -151,25 +150,24 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdevhelp-2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdevhelp-2.so.1
+%attr(755,root,root) %{_libdir}/libdevhelp-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdevhelp-3.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdevhelp-2.so
-%{_libdir}/libdevhelp-2.la
-%{_pkgconfigdir}/libdevhelp-2.0.pc
-%{_includedir}/devhelp-2.0
+%attr(755,root,root) %{_libdir}/libdevhelp-3.so
+%{_pkgconfigdir}/libdevhelp-3.0.pc
+%{_includedir}/devhelp-3.0
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libdevhelp-2.a
+%{_libdir}/libdevhelp-3.a
 
 %files -n gedit2-plugin-devhelp
 %defattr(644,root,root,755)
-%dir %{_libdir}/gedit-2/plugins/%{name}
-%{_libdir}/gedit-2/plugins/%{name}.gedit-plugin
-%{_libdir}/gedit-2/plugins/%{name}/*.py[oc]
+%{_libdir}/gedit/plugins/devhelp.plugin
+%{_libdir}/gedit/plugins/devhelp.py[co]
+
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -177,6 +175,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.1  2011/03/03 19:10:08  wiget
+- up to 2.91.90
+- use %{__rm} macro
+
 Revision 1.120  2011/02/04 18:23:41  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/devhelp/devhelp.spec?r1=1.120&r2=1.120.2.1&f=u