diff --git a/file-roller.changes b/file-roller.changes index fcc7945..537f059 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 15 16:03:23 CET 2007 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + ------------------------------------------------------------------- Tue Dec 19 00:16:29 CET 2006 - btimothy@suse.de diff --git a/file-roller.spec b/file-roller.spec index e7fdc90..df8a70c 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,7 +1,7 @@ # # spec file for package file-roller (Version 2.16.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,16 +12,12 @@ Name: file-roller BuildRequires: docbook-xsl-stylesheets gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser scrollkeeper update-desktop-files -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} License: GNU General Public License (GPL) Group: System/GUI/GNOME -Autoreqprov: on Version: 2.16.1 -Release: 32 +Release: 38 Summary: An Archive Manager for GNOME Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.6/%{name}-%{version}.tar.bz2 -Source1: file-roller.xml Patch: file-roller-ximian-defaults.patch Patch1: fr_59941.diff Patch2: file-roller-2.12.2-no-cmdline-overflow.patch @@ -30,8 +26,10 @@ Patch4: file-roller-self-exe.patch URL: http://fileroller.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Docdir: %{_defaultdocdir} -PreReq: filesystem /usr/bin/touch gconf2 shared-mime-info Requires: unrar unzip gzip bzip2 +Autoreqprov: on + +%gconf_schemas_prereq %description File Roller is an archive manager for GNOME. With it, you can create @@ -81,63 +79,58 @@ gnome-patch-translation-update %build autoreconf -i -f -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%prefix \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --localstatedir=/var/lib \ - --with-kde-datadir=/opt/kde3/share \ - --libdir=%prefix/%_lib \ - --disable-scrollkeeper -export LIBRARY_PATH=/opt/gnome/%_lib -make +%configure\ + --disable-schemas-install\ + --disable-scrollkeeper +make %{?jobs:-j%jobs} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=$RPM_BUILD_ROOT install -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving -for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/file-roller/*/file-roller.xml; do +for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/file-roller/*/file-roller.xml; do meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : done -mkdir -p $RPM_BUILD_ROOT/usr/share/mime/packages -cp %{S:1} $RPM_BUILD_ROOT/usr/share/mime/packages -# DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime -rm $RPM_BUILD_ROOT%{prefix}/%{_lib}/nautilus/extensions-1.0/*.*a - -%post -touch var/adm/SuSEconfig/run-scrollkeeper-update -usr/bin/update-mime-database /usr/share/mime >/dev/null -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/file-roller.schemas >/dev/null - -%postun -touch var/adm/SuSEconfig/run-scrollkeeper-update -usr/bin/update-mime-database /usr/share/mime >/dev/null +mkdir $RPM_BUILD_ROOT/usr/share/pixmaps +ln -s ../icons/hicolor/48x48/apps/file-roller.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +%find_lang %{name} +%find_gconf_schemas +cat %{name}.lang %{name}.schemas_list >%{name}.lst +rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a %clean rm -rf $RPM_BUILD_ROOT -%files +%pre -f %{name}.schemas_pre + +%post +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun + +%postun +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + +%files -f %{name}.lst %defattr(-, root, root) %doc AUTHORS NEWS README COPYING -%{prefix}/share/applications/*.desktop -%{prefix}/share/gnome/help/file-roller -# %{prefix}/share/file-roller/glade/*.glade -%{prefix}/%_lib/nautilus -%{prefix}/share/file-roller -#%{prefix}/share/application-registry/*.applications -#%{prefix}/share/mime-info/* -%{prefix}/share/locale/*/LC_MESSAGES/*.mo -#%{prefix}/share/pixmaps/*.png -%{prefix}/share/icons/hicolor/48x48/apps/*.png -%{prefix}/bin/file-roller -%{prefix}/share/omf/file-roller -%{sysconfdir}/gconf/schemas/file-roller.schemas -/usr/share/mime/packages/*.xml +%{_bindir}/file-roller +%{_datadir}/applications/*.desktop +%{_datadir}/file-roller +%{_datadir}/icons/hicolor/48x48/apps/*.png +%{_datadir}/omf/file-roller +%{_datadir}/pixmaps/*.png +%{_libdir}/nautilus/extensions-*/*.so %changelog -n file-roller +* Mon Jan 15 2007 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Tue Dec 19 2006 - btimothy@suse.de - Fix for BNC #223562 to allow self-extracting executables made in WinZIP to extract/open in file-roller. diff --git a/file-roller.xml b/file-roller.xml deleted file mode 100644 index 0906f79..0000000 --- a/file-roller.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -