X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=devhelp.spec;h=f4aadc668668678f3e7e99a1729512d6ed14dcd2;hb=38bceebd53818d39945afac056b2f466f1f18849;hp=2c682742b1f643d166123b8487c383bc6d8dd6cb;hpb=edc65cdd7476869507497960b8fc7d586a5690ee;p=packages%2Fdevhelp.git

diff --git a/devhelp.spec b/devhelp.spec
index 2c68274..f4aadc6 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -1,33 +1,40 @@
+# Conditional build:
+%bcond_without  apidocs         # disable gtk-doc
+%bcond_without  static_libs     # static library
+
 Summary:	API documentation browser for GNOME
 Summary(pl.UTF-8):	Przeglądarka dokumentacji API dla GNOME
 Name:		devhelp
-Version:	3.2.0
+Version:	3.24.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.2/%{name}-%{version}.tar.xz
-# Source0-md5:	f1b9eb558d8d85a50a4ecfcdb4545807
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.24/%{name}-%{version}.tar.xz
+# Source0-md5:	5aeabfd755e73082344ae46c2f8f6d66
 Patch0:		%{name}-bookdir.patch
-URL:		http://www.imendio.com/projects/devhelp/
-BuildRequires:	GConf2-devel >= 2.24.0
+Patch1:		%{name}-use-python3.patch
+URL:		https://wiki.gnome.org/Apps/Devhelp
 BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.11
-BuildRequires:	gettext-devel >= 0.17
+BuildRequires:	automake >= 1:1.14
+BuildRequires:	gettext-tools >= 0.19.7
+BuildRequires:	glib2-devel >= 1:2.38.0
 BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gtk+3-devel >= 3.0.2
-BuildRequires:	gtk-webkit3-devel >= 1.3.11
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libtool >= 2.2
+BuildRequires:	gobject-introspection-devel >= 1.30.0
+BuildRequires:	gtk+3-devel >= 3.20.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.25}
+BuildRequires:	gtk-webkit4-devel >= 2.6.0
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	pkgconfig
-BuildRequires:	python >= 2.3
+BuildRequires:	python3 >= 1:3.3
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRequires:	zlib-devel
-Requires(post,preun):	GConf2 >= 2.24.0
+Requires(post,postun):	glib2 >= 1:2.38.0
 Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gtk-webkit4 >= 2.6.0
 Requires:	hicolor-icon-theme
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
@@ -43,6 +50,9 @@ Przeglądarka dokumentacji API dla GNOME.
 Summary:	Library to embed Devhelp in other applications
 Summary(pl.UTF-8):	Biblioteka do osadzania Devhelp w innych aplikacjach
 Group:		X11/Libraries
+Requires:	glib2 >= 1:2.38.0
+Requires:	gtk+3 >= 3.20.0
+Requires:	gtk-webkit4 >= 2.6.0
 
 %description libs
 Library of Devhelp for embedding into other applications.
@@ -55,7 +65,9 @@ Summary:	Headers for Devhelp library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Devhelp
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gtk+3-devel >= 3.0.2
+Requires:	glib2-devel >= 1:2.38.0
+Requires:	gtk+3-devel >= 3.20.0
+Requires:	gtk-webkit4-devel >= 2.6.0
 
 %description devel
 Headers for Devhelp library.
@@ -75,48 +87,65 @@ Static version of Devhelp library.
 %description static -l pl.UTF-8
 Statyczna biblioteka Devhelp.
 
-%package -n gedit2-plugin-devhelp
+%package apidocs
+Summary:	Devhelp API documetation
+Summary(pl.UTF-8):	Dokumentacja API Devhelp
+Group:		Documentation
+Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description apidocs
+Devhelp API documetation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Devhelp.
+
+%package -n gedit-plugin-devhelp
 Summary:	Devhelp plugin for Gedit editor
 Summary(pl.UTF-8):	Wtyczka devhelpa dla edytora Gedit
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
-Requires:	gedit2
-Requires:	libpeas-loader-python
-Requires:	python-pygobject >= 2.27.91
-
-%description -n gedit2-plugin-devhelp
+# python3 based gedit
+Requires:	gedit >= 3.8
+Requires:	libpeas-loader-python3
+Requires:	python3 >= 1:3.3
+Requires:	python3-pygobject3 >= 3
+Obsoletes:	gedit2-plugin-devhelp
+
+%description -n gedit-plugin-devhelp
 Plugin that allows to browse API documentation in Gedit.
 
-%description -n gedit2-plugin-devhelp -l pl.UTF-8
+%description -n gedit-plugin-devhelp -l pl.UTF-8
 Wtyczka umożliwiająca przeglądanie dokumentacji API w edytorze Gedit.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-static \
-	--disable-schemas-install \
+	%{__enable_disable apidocs gtk-doc} \
+	%{__enable_disable static_libs static} \
+	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
 	--disable-silent-rules
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/{books,specs}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{books,references,specs}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*.py \
-	$RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
 
@@ -124,13 +153,11 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install devhelp.schemas
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun
-%gconf_schema_uninstall devhelp.schemas
-
 %postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
 %post	libs -p /sbin/ldconfig
@@ -141,18 +168,25 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS NEWS README TODO
 %attr(755,root,root) %{_bindir}/devhelp
 %{_datadir}/%{name}
-%{_desktopdir}/devhelp.desktop
-%{_iconsdir}/hicolor/*/apps/*.png
-%{_sysconfdir}/gconf/schemas/devhelp.schemas
+%{_desktopdir}/org.gnome.Devhelp.desktop
+%{_iconsdir}/hicolor/*x*/apps/devhelp.png
+%{_iconsdir}/hicolor/symbolic/apps/devhelp-symbolic.svg
+%{_datadir}/GConf/gsettings/devhelp.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
+%{_datadir}/appdata/org.gnome.Devhelp.appdata.xml
+%{_datadir}/dbus-1/services/org.gnome.Devhelp.service
+%{_mandir}/man1/devhelp.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdevhelp-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdevhelp-3.so.0
+%attr(755,root,root) %ghost %{_libdir}/libdevhelp-3.so.3
+%{_libdir}/girepository-1.0/Devhelp-3.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdevhelp-3.so
+%{_datadir}/gir-1.0/Devhelp-3.0.gir
 %{_pkgconfigdir}/libdevhelp-3.0.pc
 %{_includedir}/devhelp-3.0
 
@@ -160,7 +194,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libdevhelp-3.a
 
-%files -n gedit2-plugin-devhelp
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/devhelp-3
+%endif
+
+%files -n gedit-plugin-devhelp
 %defattr(644,root,root,755)
+%{_libdir}/gedit/plugins/__pycache__
 %{_libdir}/gedit/plugins/devhelp.plugin
-%{_libdir}/gedit/plugins/devhelp.py[co]
+%{_libdir}/gedit/plugins/devhelp.py