X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdevhelp.git;a=blobdiff_plain;f=devhelp.spec;h=bc95c36eb4f7096651f1e4118e0cb93345de7780;hp=3ff68148c12a7dfeae23d219fc758b340e6e34cd;hb=e846881b158be5df76289c2f7a5b1d7687d13b97;hpb=3be2333b53e0a0ddda890dd1a17e10b15f2b349a

diff --git a/devhelp.spec b/devhelp.spec
index 3ff6814..bc95c36 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -1,42 +1,37 @@
 Summary:	API documentation browser for GNOME
 Summary(pl.UTF-8):	Przeglądarka dokumentacji API dla GNOME
 Name:		devhelp
-Version:	0.16
-Release:	1
+Version:	0.23
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.16/%{name}-%{version}.tar.bz2
-# Source0-md5:	61d2300ab657ab63c65a49311916a6d2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.23/%{name}-%{version}.tar.bz2
+# Source0-md5:	704c0c90616aeb1c52ca3af1df93fde6
 Patch0:		%{name}-bookdir.patch
-Patch1:		%{name}-mozilla_includes.patch
 URL:		http://www.imendio.com/projects/devhelp/
-BuildRequires:	GConf2-devel >= 2.18.0
-BuildRequires:	autoconf
+BuildRequires:	GConf2-devel >= 2.24.0
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	gnome-common >= 2.18.0
-BuildRequires:	gnome-vfs2-devel >= 2.18.1
-BuildRequires:	gtk+2-devel >= 2:2.10.11
-BuildRequires:	libglade2-devel >= 1:2.6.0
+BuildRequires:	gettext-devel
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	gtk-webkit-devel
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.18.0
-BuildRequires:	xulrunner-devel >= 1.8.0.4
+BuildRequires:	libwnck-devel >= 2.24.0
 BuildRequires:	pkgconfig
 BuildRequires:	python
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	zlib-devel
-Requires(post,preun):	GConf2 >= 2.18.0
-Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
+Requires(post,preun):	GConf2 >= 2.20.0
 Requires:	%{name}-libs = %{version}-%{release}
-%requires_eq_to	xulrunner xulrunner-devel
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# can be provided by mozilla or mozilla-embedded
-%define		_noautoreqdep	libgtkembedmoz.so libxpcom.so
-# we have strict deps for it
-%define		_noautoreq	libxpcom.so
-
 %description
 API documentation browser for GNOME.
 
@@ -46,7 +41,7 @@ Przeglądarka dokumentacji API dla GNOME.
 %package libs
 Summary:	Library to embed Devhelp in other applications
 Summary(pl.UTF-8):	Biblioteka do osadzania Devhelp w innych aplikacjach
-Group:		Libraries
+Group:		X11/Libraries
 
 %description libs
 Library of Devhelp for embedding into other applications.
@@ -57,8 +52,10 @@ Biblioteka Devhelp do osadzania w innych aplikacjach.
 %package devel
 Summary:	Headers for Devhelp library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Devhelp
-Group:		Development/Libraries
+Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gtk+2-devel >= 2:2.14.0
+Requires:	libwnck-devel >= 2.24.0
 
 %description devel
 Headers for Devhelp library.
@@ -69,7 +66,7 @@ Pliki nagłówkowe biblioteki Devhelp.
 %package static
 Summary:	Static Devhelp library
 Summary(pl.UTF-8):	Statyczna biblioteka Devhelp
-Group:		Development/Libraries
+Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -94,11 +91,11 @@ Umożliwia przeglądanie dokumentacji API w Gedit.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -115,7 +112,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf \
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/%{name}/*.py
 
 %find_lang %{name}
@@ -125,14 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install devhelp.schemas
-%update_desktop_database_post
 %update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall devhelp.schemas
 
 %postun
-%update_desktop_database_postun
 %update_icon_cache hicolor
 
 %post	libs -p /sbin/ldconfig
@@ -141,26 +135,28 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/devhelp*
+%attr(755,root,root) %{_bindir}/devhelp
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_iconsdir}/hicolor/*/apps/*
+%{_desktopdir}/devhelp.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
+%{_iconsdir}/hicolor/scalable/apps/*.svg
 %{_sysconfdir}/gconf/schemas/devhelp.schemas
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libdevhelp-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdevhelp-1.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_pkgconfigdir}/*.pc
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libdevhelp-1.so
+%{_libdir}/libdevhelp-1.la
+%{_pkgconfigdir}/libdevhelp-1.0.pc
+%{_includedir}/devhelp-1.0
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libdevhelp-1.a
 
 %files -n gedit2-plugin-devhelp
 %defattr(644,root,root,755)