From cd9adce19b8b6b8469b7ab74d3695dfc66409a49 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Apr 15 2013 20:34:36 +0000 Subject: Minor spec file cleanup --- diff --git a/gedit.spec b/gedit.spec index e1ef8ac..36b6c8c 100644 --- a/gedit.spec +++ b/gedit.spec @@ -41,7 +41,7 @@ BuildRequires: enchant-devel >= %{enchant_version} BuildRequires: iso-codes-devel >= %{isocodes_version} BuildRequires: libattr-devel BuildRequires: gtksourceview3-devel >= %{gtksourceview_version} -BuildRequires: scrollkeeper gettext +BuildRequires: gettext BuildRequires: python3-devel BuildRequires: pygobject3-devel BuildRequires: python3-gobject >= %{pygo_version} @@ -98,7 +98,7 @@ access and leave event for documents used with gedit. %endif %prep -%setup -n gedit-%{version} -q +%setup -q %ifarch ppc64,x86_64,ia64,s390x %patch1 -p1 -b .libdir @@ -111,7 +111,6 @@ intltoolize -f %build %configure \ - --disable-scrollkeeper \ --disable-gtk-doc \ --enable-introspection=yes \ --enable-python=yes \ @@ -120,10 +119,7 @@ intltoolize -f make %{_smp_mflags} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/* @@ -151,13 +147,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : %files -f %{name}.lang -%defattr(-, root, root, -) %doc README COPYING AUTHORS %{_datadir}/gedit %{_datadir}/applications/gedit.desktop %{_mandir}/man1/* -%{_libdir}/python3.3/site-packages/gi/overrides/Gedit.py* -%{_libdir}/python3.3/site-packages/gi/overrides/__pycache__ +%{python3_sitearch}/gi/overrides/Gedit.py* +%{python3_sitearch}/gi/overrides/__pycache__ %{_libexecdir}/gedit %{_libdir}/gedit/girepository-1.0 %dir %{_libdir}/gedit @@ -199,14 +194,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : %files devel -%defattr(-, root, root, -) %{_includedir}/gedit-3.0 %{_libdir}/pkgconfig/gedit.pc %{_datadir}/gtk-doc %if %{with_zeitgeist} %files zeitgeist -%defattr(-, root, root, -) %{_libdir}/gedit/plugins/zeitgeist.plugin %{_libdir}/gedit/plugins/libzeitgeistplugin.so %endif