From 37e79028ee601306fe74b8097ce07153b9746f6a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 3 Feb 2007 15:58:35 +0000 Subject: [PATCH] - Update to 0.13 - Clean up the spec file. - Remove devhelp-0.12-transparent.patch (fixed upstream). --- .cvsignore | 2 +- devhelp.spec | 86 ++++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9b369ca..1a11e91 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -devhelp-0.12.tar.bz2 +devhelp-0.13.tar.bz2 diff --git a/devhelp.spec b/devhelp.spec index dc870ce..12d0cc7 100644 --- a/devhelp.spec +++ b/devhelp.spec @@ -1,62 +1,63 @@ %define gecko_ver 1.8.1.1 -Summary: API document browser -Name: devhelp -Version: 0.12 -Release: 10%{?dist} -License: GPL -Group: Development/Tools -Url: http://ftp.gnome.org/pub/gnome/sources/devhelp/ -Source: %{name}-%{version}.tar.bz2 -# fixed in cvs -Patch0: devhelp-0.12-transparent.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +### Abstract ### -Requires: gtk2 >= 2.2.0 -Requires: libgnomeui >= 2.2.0 -Requires: gnome-vfs2 >= 2.2.0 -Requires: libglade2 >= 2.2.0 -Requires: gecko-libs = %{gecko_ver} -BuildRequires: desktop-file-utils >= 0.3 +Name: devhelp +Version: 0.13 +Release: 1%{?dist} +License: GPL +Group: Development/Tools +Summary: API document browser +Source: devhelp-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/devhelp-%{version}-root -BuildRequires: gtk2-devel >= 2.2.0 -BuildRequires: libgnomeui-devel >= 2.2.0 -BuildRequires: gnome-vfs2-devel >= 2.2.0 -BuildRequires: libglade2-devel >= 2.2.0 -BuildRequires: gecko-devel = %{gecko_ver} -BuildRequires: intltool -BuildRequires: gettext -BuildRequires: glib2-devel >= 2.9.5 -BuildRequires: libwnck-devel >= 2.10.0 -BuildRequires: GConf2-devel >= 2.6.0 +### Dependencies ### Requires(pre): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 Requires(post): GConf2 >= 2.14 +Requires: gecko-libs = %{gecko_ver} +Requires: gnome-vfs2 >= 2.2.0 +Requires: gtk2 >= 2.2.0 +Requires: libglade2 >= 2.2.0 +Requires: libgnomeui >= 2.2.0 + +### Build Dependencies ### + +BuildRequires: GConf2-devel >= 2.6.0 +BuildRequires: desktop-file-utils >= 0.3 +BuildRequires: gecko-devel = %{gecko_ver} +BuildRequires: gettext +BuildRequires: glib2-devel >= 2.9.5 +BuildRequires: gnome-vfs2-devel >= 2.2.0 +BuildRequires: gtk2-devel >= 2.2.0 +BuildRequires: intltool +BuildRequires: libglade2-devel >= 2.2.0 +BuildRequires: libgnomeui-devel >= 2.2.0 +BuildRequires: libwnck-devel >= 2.10.0 + %description An API document browser for GNOME 2. %package devel -Summary: Library to embed Devhelp in other applications. -Group: Development/Libraries -Requires: %name = %{PACKAGE_VERSION} -Requires: gtk2-devel >= 2.2.0 -Requires: libgnomeui-devel >= 2.2.0 -Requires: libwnck-devel >= 2.10.0 -Requires: gnome-vfs2-devel >= 2.2.0 -Requires: pkgconfig +Summary: Library to embed Devhelp in other applications. +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gnome-vfs2-devel >= 2.2.0 +Requires: gtk2-devel >= 2.2.0 +Requires: libgnomeui-devel >= 2.2.0 +Requires: libwnck-devel >= 2.10.0 +Requires: pkgconfig %description devel Library of Devhelp for embedding into other applications. %prep -%setup -q -%patch0 -p1 -b .transparent +%setup -q -n devhelp-%{version} %build %configure - make %{?_smp_mflags} %install @@ -79,7 +80,7 @@ rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books -%find_lang %name +%find_lang devhelp %clean rm -rf $RPM_BUILD_ROOT @@ -110,7 +111,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%files -f %{name}.lang +%files -f devhelp.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README INSTALL @@ -133,6 +134,11 @@ fi %{_libdir}/pkgconfig/* %changelog +* Sat Feb 03 2007 Matthew Barnes - 0.13-1.fc7 +- Update to 0.13 +- Clean up the spec file. +- Remove devhelp-0.12-transparent.patch (fixed upstream). + * Thu Dec 21 2006 Christopher Aillon 0.12-10 - Rebuild against newer gecko diff --git a/sources b/sources index 3f8f307..52ff6cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -007e7bd4fb3e2e86b743944eca552460 devhelp-0.12.tar.bz2 +230c05c1e13ba6ae44c94e034ea77348 devhelp-0.13.tar.bz2