[devhelp] Update to 3.7.3
Kalev Lember
kalev at fedoraproject.org
Fri Dec 21 02:41:28 UTC 2012
commit 81e43e97f341a263cb70b9868f3d18b851339856
Author: Kalev Lember <kalevlember at gmail.com>
Date: Fri Dec 21 00:14:22 2012 +0100
Update to 3.7.3
Adapt for the GConf to gsettings conversion.
.gitignore | 1 +
devhelp.spec | 48 +++++++++++-------------------------------------
sources | 2 +-
3 files changed, 13 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86bc883..6aa496a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ devhelp-2.90.5.tar.bz2
/devhelp-3.5.92.tar.xz
/devhelp-3.6.0.tar.xz
/devhelp-3.6.1.tar.xz
+/devhelp-3.7.3.tar.xz
diff --git a/devhelp.spec b/devhelp.spec
index 12fe16e..bb105ee 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -1,7 +1,7 @@
### Abstract ###
Name: devhelp
-Version: 3.6.1
+Version: 3.7.3
Release: 1%{?dist}
Epoch: 1
License: GPLv2+
@@ -9,13 +9,10 @@ Group: Development/Tools
Summary: API documention browser
URL: http://developer.imendio.com/projects/devhelp
#VCS: git:git://git.gnome.org/devhelp
-Source: http://download.gnome.org/sources/devhelp/3.6/devhelp-%{version}.tar.xz
+Source: http://download.gnome.org/sources/devhelp/3.7/devhelp-%{version}.tar.xz
### Dependencies ###
-Requires(pre): GConf2 >= 2.14
-Requires(preun): GConf2 >= 2.14
-Requires(post): GConf2 >= 2.14
Requires(post): /usr/bin/gtk-update-icon-cache
Requires(postun): /usr/bin/gtk-update-icon-cache
@@ -27,9 +24,6 @@ BuildRequires: intltool
BuildRequires: gtk3-devel
BuildRequires: webkitgtk3-devel
BuildRequires: GConf2-devel
-BuildRequires: unique3-devel
-BuildRequires: autoconf automake libtool
-BuildRequires: gnome-common
%description
Devhelp is an API documentation browser for the GNOME desktop.
@@ -48,63 +42,38 @@ into other applications such as IDEs.
%prep
%setup -q -n devhelp-%{version}
-# force regeneration
-rm data/devhelp.schemas
-
-libtoolize -f
-aclocal
-autoconf
-
%build
%configure --disable-static
make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor gnome \
--delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/devhelp.desktop
-rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
-
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books
%find_lang devhelp
-%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/devhelp.schemas > /dev/null || :
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/devhelp.schemas > /dev/null || :
-fi
-
%post
/sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/devhelp.schemas > /dev/null || :
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ]; then
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
fi
%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%files -f devhelp.lang
@@ -115,7 +84,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_datadir}/applications/*.desktop
%{_datadir}/devhelp
-%{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/GConf/gsettings/devhelp.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
%{_datadir}/icons/hicolor/16x16/apps/devhelp.png
%{_datadir}/icons/hicolor/22x22/apps/devhelp.png
%{_datadir}/icons/hicolor/24x24/apps/devhelp.png
@@ -133,6 +103,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_libdir}/pkgconfig/*
%changelog
+* Fri Dec 21 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.7.3-1
+- Update to 3.7.3
+- Adapt for the GConf to gsettings conversion
+
* Wed Nov 14 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.6.1-1
- Update to 3.6.1
- Drop manual requires from -devel package; these are all picked up
diff --git a/sources b/sources
index 3e16c40..d2e88cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56c03dfc591f4a1a7b975291338bf12f devhelp-3.6.1.tar.xz
+ef6d0c98ef461b406c96a678262e9033 devhelp-3.7.3.tar.xz
More information about the scm-commits
mailing list