kalev pushed to gthumb (f22). "Clean out old specfile cruft"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 16 10:20:31 UTC 2015


>From f578f45810d7bf2f1411fe1b9019438c93b58d65 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Thu, 16 Apr 2015 12:05:29 +0200
Subject: Clean out old specfile cruft


diff --git a/gthumb.spec b/gthumb.spec
index 65bae92..37a0583 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -50,9 +50,6 @@ package.
 %prep
 %setup -q
 
-# Hack to use webkitgtk4 until gthumb 3.3.3 is released
-sed -i -e 's/webkit2gtk-3\.0/webkit2gtk-4.0/g' configure
-
 %build
 %configure --enable-libopenraw --disable-static
 
@@ -63,14 +60,10 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dyn
 make %{?_smp_mflags}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-
 %find_lang %{name} --with-gnome
 
 %post
@@ -93,7 +86,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/gthumb/
 %{_datadir}/glib-2.0/schemas/org.gnome.gthumb*
@@ -111,7 +103,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_mandir}/man?/gthumb*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/gthumb-3.4/
 %{_libdir}/pkgconfig/gthumb-3.4.pc
 %{_datadir}/aclocal/*
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gthumb.git/commit/?h=f22&id=f578f45810d7bf2f1411fe1b9019438c93b58d65


More information about the scm-commits mailing list