rpms/gnome-utils/devel .cvsignore, 1.69, 1.70 gnome-utils.spec, 1.180, 1.181 sources, 1.73, 1.74

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8338

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.25.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	22 Dec 2008 22:14:48 -0000	1.69
+++ .cvsignore	12 Jan 2009 02:41:59 -0000	1.70
@@ -1 +1 @@
-gnome-utils-2.25.0.tar.bz2
+gnome-utils-2.25.2.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- gnome-utils.spec	23 Dec 2008 05:59:51 -0000	1.180
+++ gnome-utils.spec	12 Jan 2009 02:41:59 -0000	1.181
@@ -4,13 +4,12 @@
 %define gnome_doc_utils_version 0.3.2
 %define libgnome_version 2.13.7
 %define libgnomeui_version 2.13.2
-%define libgnomeprintui_version 2.8.0
 %define gnome_desktop_version 2.9.91
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.25.0
-Release:        3%{?dist}
+Version:        2.25.2
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -20,21 +19,11 @@
 Source0:        http://download.gnome.org/sources/gnome-utils/2.25/gnome-utils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: 	logview-close-crash.patch
-Patch1:		logview-scroll-crash.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=497489
-Patch2:		logview-versions-crash.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=497490
-Patch3:		logview-versions-format.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=565428
-Patch4:		gfloppy-libgnome.patch
-
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnome-devel >= %{libgnome_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires:  libgnomeprintui22-devel >= %{libgnomeprintui_version}
 BuildRequires:  gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires:  libXmu-devel 
@@ -82,11 +71,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .logview-close
-%patch1 -p1 -b .logview-scroll
-%patch2 -p1 -b .versions-crash
-%patch3 -p1 -b .versions-format
-%patch4 -p1 -b .gfloppy-libgnome
 
 # Hide from menus
 pushd gsearchtool
@@ -97,15 +81,6 @@
 echo "NoDisplay=true" >> gfloppy.desktop.in
 popd
 
-pushd logview
-cat <<EOF >gnome-system-log-pam
-#%PAM-1.0
-auth		include		config-util
-account		include		config-util
-session		include		config-util
-EOF
-popd
-
 autoreconf -f -i
 
 %build
@@ -132,8 +107,33 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# don't need this
+/bin/rm $RPM_BUILD_ROOT%{_bindir}/test-reader
+
+# make gnome-system-log use consolehelper until it starts using polkit
+./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+/bin/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
+
+./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+/bin/cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
+USER=root
+PROGRAM=/usr/sbin/gnome-system-log
+SESSION=true
+FALLBACK=true
+EOF
+
+./mkinstalldirs $RPM_BUILD_ROOT%{_sbindir}
+/bin/mv $RPM_BUILD_ROOT%{_bindir}/gnome-system-log $RPM_BUILD_ROOT%{_sbindir}
+/bin/ln -s /usr/bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/gnome-system-log
+
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -234,16 +234,16 @@
 %{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
 %{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 %{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas
-%{_sysconfdir}/gconf/schemas/logview.schemas
+%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas
 %{_sysconfdir}/gconf/schemas/gfloppy.schemas
 %{_sysconfdir}/gconf/schemas/baobab.schemas
 %{_bindir}/gnome-dictionary
 %{_bindir}/gnome-panel-screenshot
 %{_bindir}/gnome-screenshot
 %{_bindir}/gnome-search-tool
-%{_bindir}/gnome-system-log
 %{_bindir}/gfloppy
 %{_bindir}/baobab
+%{_bindir}/gnome-system-log
 %{_sbindir}/gnome-system-log
 %{_datadir}/applications/gnome-dictionary.desktop
 %{_datadir}/applications/gnome-screenshot.desktop
@@ -254,7 +254,6 @@
 %{_datadir}/gdict-1.0/
 %{_datadir}/gnome-dictionary/
 %{_datadir}/gnome-screenshot/
-%{_datadir}/gnome-system-log/
 %{_datadir}/baobab/
 %{_datadir}/gnome-utils/
 %{_datadir}/pixmaps/gsearchtool/
@@ -278,6 +277,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.2-1
+- Update to 2.25.2
+
 * Mon Dec 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.25.0-3
 - Update to 2.25.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	22 Dec 2008 22:14:49 -0000	1.73
+++ sources	12 Jan 2009 02:41:59 -0000	1.74
@@ -1 +1 @@
-aef9dea90a1b59394d006e9457d4a48f  gnome-utils-2.25.0.tar.bz2
+57356ac7203412cf799a15f732b95218  gnome-utils-2.25.2.tar.bz2