rpms/evince/devel evince.spec,1.37,1.38
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 23 15:51:45 UTC 2006
- Previous message (by thread): rpms/sudo/devel sudo-1.6.8p8-selinux.patch, 1.2, 1.3 sudo.spec, 1.33, 1.34
- Next message (by thread): rpms/kudzu/devel .cvsignore, 1.97, 1.98 kudzu.spec, 1.110, 1.111 sources, 1.108, 1.109
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: krh
Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19264
Modified Files:
evince.spec
Log Message:
* Mon Jan 23 2006 Kristian Høgsberg <krh at redhat.com> 0.5.0-2
- Spec file update from Brian Pepple <bdpepple at ameritech.net> (#123527):
- Drop Requires for gtk2 & poppler, devel soname pulls these in.
- Disable GConf schema install in install section.
- Add BR for gnome-doc-utils, nautilus & libXt-devel.
- Use smp_mflags.
- Drop BR for desktop-file-utils,gcc & gcc-c++.
- Add URL & full source.
- Use more macros.
- Fix ownership of some directories.
- Drop depreciated prereq, and use requires.
- Use fedora extras preferred buildroot.
- Various formatting changes.
Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- evince.spec 20 Jan 2006 15:42:19 -0000 1.37
+++ evince.spec 23 Jan 2006 15:51:42 -0000 1.38
@@ -2,84 +2,139 @@
%define gtk2_version 2.6.0
%define dbus_version 0.60
-Summary: Document viewer
-Name: evince
-Version: 0.5.0
-Release: 1
-License: GPL
-Group: Applications/Publishing
-Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: poppler-devel >= %{poppler_version}
-BuildRequires: libgnomeprintui22-devel
-BuildRequires: libgnomeui-devel
-BuildRequires: gnome-vfs2-devel
-BuildRequires: libglade2-devel
-BuildRequires: libtiff-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: desktop-file-utils
-BuildRequires: scrollkeeper
-BuildRequires: dbus-devel >= %{dbus_version}
-Prereq: /usr/bin/update-desktop-database
-PreReq: scrollkeeper >= 0.1.4
-Requires: gtk2 >= %{gtk2_version}
-Requires: poppler >= %{poppler_version}
+Name: evince
+Version: 0.5.0
+Release: 2
+Summary: Document viewer
+
+License: GPL
+Group: Applications/Publishing
+URL: http://www.gnome.org/projects/evince/
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: poppler-devel >= %{poppler_version}
+BuildRequires: libXt-devel
+BuildRequires: nautilus
+BuildRequires: libgnomeprintui22-devel
+BuildRequires: libgnomeui-devel
+BuildRequires: gnome-vfs2-devel
+BuildRequires: libglade2-devel
+BuildRequires: libtiff-devel
+BuildRequires: gnome-doc-utils
+BuildRequires: scrollkeeper
+BuildRequires: dbus-devel >= %{dbus_version}
+
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils
+
%description
evince is a GNOME-based document viewer.
+
%prep
%setup -q
+
%build
%configure --disable-scrollkeeper
-make
+make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%makeinstall
+%find_lang %name
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-
/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-
# Get rid of static libs and .la files.
/bin/rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/*.a
/bin/rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/*.la
-%find_lang %name
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-update-desktop-database %{_datadir}/applications
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ SCHEMAS="evince.schemas evince-thumbnailer.schemas"
+ for S in $SCHEMAS; do
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/$S >/dev/null || :
+ done
+ killall -HUP gconfd-2 || :
+fi
+
+
+%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
SCHEMAS="evince.schemas evince-thumbnailer.schemas"
for S in $SCHEMAS; do
- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+ gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/$S > /dev/null || :
done
-scrollkeeper-update
+killall -HUP gconfd-2 || :
+
+update-desktop-database &> /dev/null ||:
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ SCHEMAS="evince.schemas evince-thumbnailer.schemas"
+ for S in $SCHEMAS; do
+ gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/$S > /dev/null || :
+ done
+ killall -HUP gconfd-2 || :
+fi
+
%postun
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database &> /dev/null ||:
+scrollkeeper-update -q || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README ChangeLog
%{_bindir}/*
%{_libdir}/nautilus/extensions-1.0/libevince-properties-page.so*
-%{_datadir}/evince
-%{_datadir}/applications/*.desktop
+%{_datadir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
%{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/gnome/help/evince
-%{_datadir}/omf/evince
+%{_datadir}/gnome/help/%{name}/
+%{_datadir}/omf/%{name}/
+
%changelog
+* Mon Jan 23 2006 Kristian Høgsberg <krh at redhat.com> 0.5.0-2
+- Spec file update from Brian Pepple <bdpepple at ameritech.net> (#123527):
+ - Drop Requires for gtk2 & poppler, devel soname pulls these in.
+ - Disable GConf schema install in install section.
+ - Add BR for gnome-doc-utils, nautilus & libXt-devel.
+ - Use smp_mflags.
+ - Drop BR for desktop-file-utils,gcc & gcc-c++.
+ - Add URL & full source.
+ - Use more macros.
+ - Fix ownership of some directories.
+ - Drop depreciated prereq, and use requires.
+ - Use fedora extras preferred buildroot.
+ - Various formatting changes.
+
* Fri Jan 20 2006 Kristian Høgsberg <krh at redhat.com> 0.5.0-1
- Update to 0.5.0 release.
- Previous message (by thread): rpms/sudo/devel sudo-1.6.8p8-selinux.patch, 1.2, 1.3 sudo.spec, 1.33, 1.34
- Next message (by thread): rpms/kudzu/devel .cvsignore, 1.97, 1.98 kudzu.spec, 1.110, 1.111 sources, 1.108, 1.109
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list