SPECS: gnome-screensaver.spec - 2.22.0 - merged from DEVEL

[patrys]

Author: patrys                       Date: Wed Mar 12 00:43:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-screensaver.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/gnome-screensaver.spec
diff -u SPECS/gnome-screensaver.spec:1.52 SPECS/gnome-screensaver.spec:1.53
--- SPECS/gnome-screensaver.spec:1.52	Fri Feb  8 21:19:25 2008
+++ SPECS/gnome-screensaver.spec	Wed Mar 12 01:43:51 2008
@@ -2,38 +2,39 @@
 Summary:	GNOME screensaver
 Summary(pl.UTF-8):	Wygaszacz ekranu GNOME
 Name:		gnome-screensaver
-Version:	2.20.0
-Release:	3
+Version:	2.22.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	d166a3ebf69289331b2ebcf5c0187fd9
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	3f307d340d511c97192a9dc9b83a69f5
 Source1:	%{name}.pamd
 Source2:	http://ep09.pld-linux.org/~havner/%{name}-xscreensaver.tar.gz
 # Source2-md5:	58ad753724418430fa93f02558056eab
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-cosmos_theme_dir.patch
-BuildRequires:	GConf2-devel >= 2.18.0.1
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	OpenGL-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.15.6
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-menus-devel >= 2.20.0
-BuildRequires:	gnome-vfs2-devel >= 2.20.0
-BuildRequires:	gtk+2-devel >= 2:2.12.0
-BuildRequires:	intltool >= 0.35.5
-BuildRequires:	libexif-devel >= 1:0.6.13
-BuildRequires:	libglade2 >= 1:2.6.0
-BuildRequires:	libgnomekbd-devel >= 2.18.0
-BuildRequires:	libgnomeui-devel >= 2.18.1
+BuildRequires:	gnome-menus-devel >= 2.22.0
+BuildRequires:	gtk+2-devel >= 2:2.12.8
+BuildRequires:	intltool >= 0.36.0
+BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libgnomekbd-devel >= 2.21.4
+BuildRequires:	libnotify-devel
 BuildRequires:	libtool
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 BuildRequires:	xmlto
+BuildRequires:	xorg-lib-libXScrnSaver-devel
 BuildRequires:	xorg-lib-libXmu-devel
 Requires(post,preun):	GConf2
-Requires:	libgnomeui >= 2.18.1
 Requires:	xdg-menus
 Obsoletes:	xscreensaver-gnome2
 # sr at Latn vs. sr at latin
@@ -66,6 +67,9 @@
 %patch0 -p1
 %patch1 -p1
 
+sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
+
 %build
 %{__intltoolize}
 %{__libtoolize}
@@ -107,8 +111,6 @@
 done
 cd $_DIR
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name}
 
 %clean
@@ -124,22 +126,30 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gnome-screensaver
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/gnome-screensaver
+%attr(755,root,root) %{_bindir}/gnome-screensaver
+%attr(755,root,root) %{_bindir}/gnome-screensaver-command
+%attr(755,root,root) %{_bindir}/gnome-screensaver-preferences
+%dir %{_libdir}/gnome-screensaver
+%attr(755,root,root) %{_libdir}/gnome-screensaver/floaters
+%attr(755,root,root) %{_libdir}/gnome-screensaver/popsquares
+%attr(755,root,root) %{_libdir}/gnome-screensaver/slideshow
 %attr(755,root,root) %{_libdir}/gnome-screensaver-dialog
 %attr(755,root,root) %{_libdir}/gnome-screensaver-gl-helper
 %{_datadir}/%{name}
-%{_datadir}/desktop-directories/*
+%{_datadir}/desktop-directories/gnome-screensaver.directory
 %dir %{_desktopdir}/screensavers
 %{_desktopdir}/screensavers/cosmos-slideshow.desktop
 %{_desktopdir}/screensavers/footlogo-floaters.desktop
 %{_desktopdir}/screensavers/personal-slideshow.desktop
 %{_desktopdir}/screensavers/popsquares.desktop
-%{_desktopdir}/*.desktop
+%{_desktopdir}/gnome-screensaver-preferences.desktop
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas
-%{_sysconfdir}/xdg/menus/*
-%{_pkgconfigdir}/*.pc
+%{_sysconfdir}/xdg/menus/gnome-screensavers.menu
+%{_pkgconfigdir}/gnome-screensaver.pc
+%{_mandir}/man1/gnome-screensaver.1*
+%{_mandir}/man1/gnome-screensaver-command.1*
+%{_mandir}/man1/gnome-screensaver-preferences.1*
 
 %files xscreensaver -f xscreensaver.files
 %defattr(644,root,root,755)
@@ -150,9 +160,26 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2008-03-12 00:43:51  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.51.2.4  2008-03-12 00:42:18  patrys
+- 2.22.0
+
+Revision 1.51.2.3  2008-03-03 22:57:42  megabajt
+- updated deps
+- more verbose files
+
 Revision 1.52  2008-02-08 20:19:25  hawk
 - release 3
 
+Revision 1.51.2.2  2008-02-05 02:27:06  patrys
+- proper epoch on glib2
+
+Revision 1.51.2.1  2008-02-05 01:04:41  patrys
+- 2.21.6
+
 Revision 1.51  2007-11-04 23:57:02  ankry
 - sr at Latn -> sr at latin, rel. 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-screensaver.spec?r1=1.52&r2=1.53&f=u