- moved /usr/X11R6 -> /usr, some cleanups, release 5

Changed files:
    file-roller.spec -> 1.15

diff --git a/file-roller.spec b/file-roller.spec
index 7a1e8ede836af0d7069378f059c7c7078ffd3845..9e88cc330a359863406db9aabbc80d866ad06ad1 100644 (file)
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -3,7 +3,7 @@ Summary(pl):    Zarz
 Summary(pt_BR):        Gerenciador de arquivos compactados para o GNOME
 Name:          file-roller
 Version:       2.1.2
-Release:       3
+Release:       5
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://prdownloads.sourceforge.net/fileroller/%{name}-%{version}.tar.gz
@@ -20,11 +20,6 @@ Requires(post):      scrollkeeper
 Requires(post):        GConf2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define                _sysconfdir     /etc/X11/GNOME2/gconf/schemas
-%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
-
 %description
 File Roller is an archive manager for the GNOME environment. With File
 Roller you can: create and modify archives; view the content of an
@@ -77,8 +72,7 @@ rm -f missing
 %{__autoconf}
 %{__automake}
 %configure \
-    --disable-schemas-install \
-    --with-gconf-schema-file-dir=%{_sysconfdir}
+    --disable-schemas-install 
 %{__make}
 
 %install
@@ -95,8 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /usr/bin/scrollkeeper-update
-GCONF_CONFIG_SOURCE="" \
-%{_bindir}/gconftool-2 --makefile-install-rule %{_sysconfdir}/*.schemas > /dev/null
+%gconf_schema_install
 
 %postun -p /usr/bin/scrollkeeper-update