[devhelp/f14/master] drop gtk3-inducing patch
Matthias Clasen
mclasen at fedoraproject.org
Sat Aug 7 15:01:38 UTC 2010
commit d9fd36849b755254b8ee0eecb3baa617102502bd
Author: Matthias Clasen <mclasen at redhat.com>
Date: Sat Aug 7 11:00:24 2010 -0400
drop gtk3-inducing patch
devhelp-gtk3.patch | 10 ----------
devhelp.spec | 13 -------------
2 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/devhelp.spec b/devhelp.spec
index 7ae7760..71b8a9e 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -15,9 +15,6 @@ URL: http://developer.imendio.com/projects/devhelp
#VCS: git:git://git.gnome.org/devhelp
Source: http://download.gnome.org/sources/devhelp/2.31/devhelp-%{version}.tar.bz2
-# upstream fix
-Patch0: devhelp-gtk3.patch
-
### Dependencies ###
Requires(pre): GConf2 >= 2.14
@@ -54,22 +51,15 @@ into other applications such as IDEs.
%prep
%setup -q -n devhelp-%{version}
-%patch0 -p1 -b .gtk3
# 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
@@ -85,9 +75,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books
%find_lang devhelp
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
More information about the scm-commits
mailing list