rpms/gnome-utils/devel gnome-utils.spec, 1.104, 1.105 sources, 1.47, 1.48 gnome-system-log.console, 1.1, NONE gnome-system-log.pam, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 18 16:15:50 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4320
Modified Files:
gnome-utils.spec sources
Removed Files:
gnome-system-log.console gnome-system-log.pam
Log Message:
split off
Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-utils.spec 13 Mar 2006 21:24:00 -0000 1.104
+++ gnome-utils.spec 18 Apr 2006 16:15:47 -0000 1.105
@@ -1,77 +1,67 @@
-%define glib2_version 2.6.0
-%define pango_version 1.8.0
+%define glib2_version 2.9.1
%define gtk2_version 2.6.0
-%define libgnomeui_version 2.12.0
-%define libgnome_version 2.12.0
-%define gail_version 1.2.0
-%define gnome_panel_version 2.9.4
%define desktop_file_utils_version 0.9
-%define libgnomeprint_2_2_version 2.8.0
-%define libgnomeprintui_2_2_version 2.8.0
-%define gnome_doc_utils_version 0.3.2
-
-%define po_package gnome-utils-2.0
-
-%define gcalctool_version 5.7.32
-%define gucharmap_version 1.6.0
-%define zenity_version 2.14.0
-
-%define dbus_version 0.60
-
-Summary: GNOME utility programs.
-Name: gnome-utils
-Version: 2.14.0
-Release: 3
-Epoch: 1
-License: GPL
-Group: Applications/System
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-utils/gnome-utils-%{version}.tar.bz2
-Source2: gcalctool-%{gcalctool_version}.tar.gz
-Source3: gucharmap-%{gucharmap_version}.tar.bz2
-Source4: zenity-%{zenity_version}.tar.bz2
-Source5: gnome-system-log.console
-Source6: gnome-system-log.pam
-
-Patch0: gnome-utils-2.11.90-schemasdir.patch
-Patch1: gcalctool-flex-crap.patch
-Patch2: logview-close-crash.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Obsoletes: gnome
-URL: http://www.gnome.org
-PreReq: %{_bindir}/update-gtk-immodules
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
+Name: gnome-utils
+Version: 2.14.0
+Release: 6
+Summary: GNOME utility programs
+
+Group: Applications/System
+License: GPL
+URL: http://www.gnome.org
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-utils/gnome-utils-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: pango-devel >= %{pango_version}
+Patch0: logview-close-crash.patch
+
+BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libglade2-devel
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libgnome-devel >= %{libgnome_version}
-BuildRequires: libgnomecanvas-devel
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_2_2_version}
-BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_2_2_version}
-BuildRequires: gail-devel >= %{gail_version}
-BuildRequires: gnome-panel >= %{gnome_panel_version}
-BuildRequires: gnome-panel-devel
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: e2fsprogs-devel
-BuildRequires: gnome-desktop-devel
-BuildRequires: bison
-BuildRequires: flex
-BuildRequires: hal-devel
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: libgnome-devel >= 2.13.7
+BuildRequires: libgnomeui-devel >= 2.13.2
+BuildRequires: libgnomeprintui22-devel >= 2.8.0
+BuildRequires: gnome-desktop-devel >= 2.9.91
+BuildRequires: gnome-panel-devel >= 2.9.4
+BuildRequires: libXmu-devel
+BuildRequires: libX11-devel
+
+Requires: usermode
+
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
+
+# Requirements to make upgrading from older gnome-utils work
+# can be dropped post-FC6
+Requires: gcalctool
+Requires: gucharmap
+Requires: zenity
+
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
GUI applications and desktop tools to be used in conjunction with a
window manager for the X Window System. The gnome-utils package
-includes a set of small "desk accessory" utility applications for GNOME
-such as a calculator.
+includes a set of small "desk accessory" utility applications for GNOME.
+
+%package devel
+Summary: Libraries and headers for gnome-utils libraries
+Group: Development/Libraries
+Requires: glib2-devel >= %{glib2_version}
+Requires: gtk2-devel >= %{gtk2_version}
+Requires: gnome-utils = %{version}-%{release}
+
+%description devel
+The gnome-utils-devel package contains header files and other resources
+needed develop programs using the libraries contained in gnome-utils.
+
%prep
%setup -q
+%patch0 -p1 -b .logview-close
# Hide from menus
pushd gsearchtool
@@ -82,151 +72,128 @@
echo "NoDisplay=true" >> gfloppy.desktop.in
popd
-tar xzf %{SOURCE2}
-tar xjf %{SOURCE3}
-tar xjf %{SOURCE4}
-
-pushd gcalctool-%{gcalctool_version}
-%patch0 -p2 -b .schemasdir
-%patch1 -p2 -b .flex-crap
-popd
-
-%patch2 -p1 -b .logview-close
%build
-pushd gcalctool-%{gcalctool_version}
-%configure
-make
-popd
-
-pushd gucharmap-%{gucharmap_version}
-%configure --disable-gtk-immodules --disable-scrollkeeper
-make
-popd
-
-pushd zenity-%{zenity_version}
%configure --disable-scrollkeeper
-make
-popd
+make %{?_smp_mflags}
-%configure --disable-scrollkeeper
-make
%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-pushd gcalctool-%{gcalctool_version}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
-pushd gucharmap-%{gucharmap_version}
-make install DESTDIR=$RPM_BUILD_ROOT RUN_QUERY_IMMODULES_TEST=false
-popd
-
-pushd zenity-%{zenity_version}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-# in GNOME only
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-only-show-in GNOME \
$RPM_BUILD_ROOT%{_datadir}/applications/*
-## delete, duplicates file roller
-/bin/rm -rf $RPM_BUILD_ROOT%{_bindir}/archive-generator
-/bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*archive-generator*
-/bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/archive-generator
-/bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/gnome-utils/*archive-generator*
-
# make gnome-system-log use consolehelper
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
/bin/mv $RPM_BUILD_ROOT%{_bindir}/gnome-system-log $RPM_BUILD_ROOT%{_sbindir}/gnome-system-log
pushd $RPM_BUILD_ROOT%{_bindir}
/bin/ln -fs consolehelper gnome-system-log
popd
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
-cp %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-cp %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
+USER=root
+PROGRAM=/usr/sbin/gnome-system-log
+SESSION=true
+EOF
-# blow scrollkeeper crap
-/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-
-%find_lang %{po_package}
-%find_lang zenity-0.1
-%find_lang gucharmap
-%find_lang gcalctool
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
+#%PAM-1.0
+auth include config-util
+account include config-util
+session include config-util
+EOF
-cat %{po_package}.lang zenity-0.1.lang gucharmap.lang gcalctool.lang > all.lang
+%find_lang gnome-utils-2.0
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.2.0/immodules/*.a
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.2.0/immodules/*.la
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
/sbin/ldconfig
-update-desktop-database %{_datadir}/applications
+scrollkeeper-update -q
+update-desktop-database -q
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-dictionary.schemas gfloppy.schemas logview.schemas gcalctool.schemas gnome-search-tool.schemas gnome-screenshot.schemas"
+export SCHEMAS="gnome-dictionary.schemas logview.schemas gnome-search-tool.schemas gnome-screenshot.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
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
-fi
%postun
/sbin/ldconfig
-update-desktop-database %{_datadir}/applications
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
-fi
+scrollkeeper-update -q
+update-desktop-database -q
-%files -f all.lang
-%defattr(-, root, root)
-
+%files -f gnome-utils-2.0.lang
+%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{_datadir}/pixmaps
-%{_datadir}/man/man*/*
-%{_datadir}/applications
-%{_datadir}/gnome-utils
-%{_datadir}/gnome-system-log
-%{_datadir}/gnome
-%{_datadir}/omf
-%{_datadir}/zenity
-%{_datadir}/gnome-screenshot
-%{_datadir}/gnome-2.0
-%{_datadir}/gdict-1.0
-%{_datadir}/gnome-dictionary
-%{_datadir}/gtk-doc/html/gdict
-%{_datadir}/icons/hicolor/48x48/apps/*
-%{_libdir}/pkgconfig/*
-%{_bindir}/*
-%{_libexecdir}/*
-%{_libdir}/*.so*
-%{_libdir}/bonobo
-%{_sysconfdir}/gconf
-%{_includedir}/*
-%{_sbindir}/gnome-system-log
%{_sysconfdir}/security/console.apps/gnome-system-log
%{_sysconfdir}/pam.d/gnome-system-log
+%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
+%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
+%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas
+%{_sysconfdir}/gconf/schemas/logview.schemas
+%{_bindir}/gnome-dictionary
+%{_bindir}/gnome-panel-screenshot
+%{_bindir}/gnome-screenshot
+%{_bindir}/gnome-search-tool
+%{_bindir}/gnome-system-log
+%{_sbindir}/gnome-system-log
+%{_datadir}/applications/gnome-dictionary.desktop
+%{_datadir}/applications/gnome-screenshot.desktop
+%{_datadir}/applications/gnome-search-tool.desktop
+%{_datadir}/applications/gnome-system-log.desktop
+%{_datadir}/gdict-1.0/
+%{_datadir}/gnome-dictionary/
+%{_datadir}/gnome-screenshot/
+%{_datadir}/gnome-system-log/
+%{_datadir}/gnome/help/gnome-dictionary/
+%{_datadir}/gnome/help/gnome-search-tool/
+%{_datadir}/gnome/help/gnome-system-log/
+%{_datadir}/pixmaps/gnome-dictionary.png
+%{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
+%{_libexecdir}/gnome-dictionary-applet
+%{_datadir}/gnome-2.0/ui/GNOME_DictionaryApplet.xml
+%{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server
+%{_libdir}/libgdict-1.0.so.*
+%{_datadir}/gtk-doc/html/gdict/
+%{_datadir}/man/man1/gnome-dictionary.1.gz
+%{_datadir}/man/man1/gnome-search-tool.1.gz
+%{_datadir}/man/man1/gnome-system-log.1.gz
+%{_datadir}/omf/gnome-dictionary/
+%{_datadir}/omf/gnome-search-tool/
+%{_datadir}/omf/gnome-system-log/
+
+
+%files devel
+%{_libdir}/libgdict-1.0.so
+%{_libdir}/pkgconfig/gdict-1.0.pc
+%{_includedir}/gdict-1.0/
+
%changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-6
+- Incorporate package review feedback
+- Split off a -devel subpackage
+
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-5
+- Split off gucharmap, zenity, gcalctool
+
* Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
- Update to zenity 2.14.0
@@ -567,7 +534,7 @@
* Thu Mar 15 2001 Havoc Pennington <hp at redhat.com>
- translations
-* Fri Feb 23 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Feb 23 2001 Trond Eivind Glomsrød <teg at redhat.com>
- use %%{_tmppath}
- move changelog to end of file
- langify, remember to run %%find_lang twice as there
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 13 Mar 2006 21:12:19 -0000 1.47
+++ sources 18 Apr 2006 16:15:47 -0000 1.48
@@ -1,4 +1 @@
d1d16ff6bfc1f6ddc110d18ec4dfdbfa gnome-utils-2.14.0.tar.bz2
-8af03f350c988d1565922b10776bc725 gucharmap-1.6.0.tar.bz2
-c4d4234f6951389027399e9c596a8abe gcalctool-5.7.32.tar.gz
-872f0f25a3c41b9a4e89cb3be9518e11 zenity-2.14.0.tar.bz2
--- gnome-system-log.console DELETED ---
--- gnome-system-log.pam DELETED ---
More information about the fedora-cvs-commits
mailing list