SPECS (DEVEL): gnome-screensaver.spec - 2.17.8

patrys patrys at pld-linux.org
Sun Mar 4 23:49:49 CET 2007


Author: patrys                       Date: Sun Mar  4 22:49:49 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 2.17.8

---- Files affected:
SPECS:
   gnome-screensaver.spec (1.22.2.7 -> 1.22.2.8) 

---- Diffs:

================================================================
Index: SPECS/gnome-screensaver.spec
diff -u SPECS/gnome-screensaver.spec:1.22.2.7 SPECS/gnome-screensaver.spec:1.22.2.8
--- SPECS/gnome-screensaver.spec:1.22.2.7	Mon Feb 12 14:20:13 2007
+++ SPECS/gnome-screensaver.spec	Sun Mar  4 23:49:44 2007
@@ -1,33 +1,40 @@
 # $Revision$, $Date$
 Summary:	GNOME screensaver
-Summary(pl.UTF-8):   Wygaszacz ekranu GNOME
+Summary(pl.UTF-8):	Wygaszacz ekranu GNOME
 Name:		gnome-screensaver
-Version:	2.14.0
+Version:	2.17.8
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.14/%{name}-%{version}.tar.bz2
-# Source0-md5:	290883980efaecd1b3ec275339672932
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.17/%{name}-%{version}.tar.bz2
+# Source0-md5:	28e5dc0f96dbf60014222000a02639a9
 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.12.0
+BuildRequires:	GConf2-devel >= 2.16.0
+BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.36
+BuildRequires:	dbus-glib-devel >= 0.71
 BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-menus-devel >= 2.12.0
-BuildRequires:	gnome-vfs2-devel >= 2.12.0
-BuildRequires:	gtk+2-devel >= 2:2.8.3
-BuildRequires:	intltool >= 0.34.1
-BuildRequires:	libexif-devel >= 0.6.12
-BuildRequires:	libglade2 >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.12.0
+BuildRequires:	gnome-menus-devel >= 2.16.1
+BuildRequires:	gnome-vfs2-devel >= 2.16.3
+BuildRequires:	gtk+2-devel >= 2:2.10.9
+BuildRequires:	intltool >= 0.35.4
+BuildRequires:	libexif-devel >= 1:0.6.13
+BuildRequires:	libglade2 >= 1:2.6.0
+BuildRequires:	libgnomeui-devel >= 2.16.1
 BuildRequires:	libtool
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
-Requires(post,preun):   GConf2
+BuildRequires:	xmlto
+BuildRequires:	xorg-lib-libXmu-devel
+Requires(post,preun):	GConf2 >= 2.16.0
+Requires:	libgnomeui >= 2.16.1
 Requires:	xdg-menus
+Obsoletes:	xscreensaver-gnome2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,8 +45,21 @@
 Nowe rozwiÄ
zanie wygaszcza ekranu dla GNOME, z bardziej zgodnymi z HIG
 dialogami i lepszÄ
 integracjÄ
 z desktopem niĹź stary xscreensaver.
 
+%package xscreensaver
+Summary:	Support for xscreensaver
+Summary(pl.UTF-8):	Wsparcie dla xscreensavera
+Group:		X11/Applications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	xscreensaver-savers
+
+%description xscreensaver
+Support for xscreensaver.
+
+%description xscreensaver -l pl.UTF-8
+Wsparcie dla xscreensavera.
+
 %prep
-%setup -q
+%setup -q -a2
 %patch0 -p1
 %patch1 -p1
 
@@ -60,9 +80,9 @@
 	--with-xf86vmode-ext \
 	--with-xidle-ext \
 	--with-xinerama-ext \
-	--with-xscreensaverdir=%{_sysconfdir}/X11/xscreensaver \
+	--with-xscreensaverdir=%{_datadir}/xscreensaver \
 	--with-xscreensaverhackdir=%{_libdir}/xscreensaver \
-	--with-gdm-config=%{_sysconfdir}/gdm/gdm.conf
+	--with-gdm-config=%{_datadir}/gdm/defaults.conf
 %{__make}
 
 %install
@@ -73,7 +93,16 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gnome-screensaver
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+_DIR=$(pwd)
+cd %{name}-xscreensaver
+# this one is provided by gnome-screensaver
+rm -f popsquares.desktop
+install * $RPM_BUILD_ROOT%{_desktopdir}/screensavers
+echo '%defattr(644,root,root,755)' > $_DIR/xscreensaver.files
+for I in *; do
+	echo "%{_desktopdir}/screensavers/$I" >> $_DIR/xscreensaver.files
+done
+cd $_DIR
 
 %find_lang %{name}
 
@@ -91,14 +120,24 @@
 %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-dialog
 %attr(755,root,root) %{_libdir}/gnome-screensaver
+%attr(755,root,root) %{_libdir}/gnome-screensaver-dialog
+%attr(755,root,root) %{_libdir}/gnome-screensaver-gl-helper
 %{_datadir}/%{name}
 %{_datadir}/desktop-directories/*
+%dir %{_desktopdir}/screensavers
+%{_desktopdir}/screensavers/cosmos-slideshow.desktop
+%{_desktopdir}/screensavers/footlogo-floaters.desktop
+%{_desktopdir}/screensavers/personal-slideshow.desktop
+%{_desktopdir}/screensavers/popsquares.desktop
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas
 %{_sysconfdir}/xdg/menus/*
+%{_pkgconfigdir}/*.pc
+
+%files xscreensaver -f xscreensaver.files
+%defattr(644,root,root,755)
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -106,8 +145,91 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.22.2.7  2007/02/12 13:20:13  baggins
+Revision 1.22.2.8  2007/03/04 22:49:44  patrys
+- 2.17.8
+
+Revision 1.46  2007/02/13 07:16:47  glen
+- tabs in preamble
+
+Revision 1.45  2007/02/12 00:48:57  baggins
 - converted to UTF-8
+
+Revision 1.44  2007/02/01 15:12:45  megabajt
+- updated to 2.16.3
+
+Revision 1.43  2006/12/26 19:47:27  megabajt
+- up to 2.16.2
+
+Revision 1.42  2006/10/04 20:28:56  grzegol
+- 2.16.1
+
+Revision 1.41  2006/09/05 21:14:51  grzegol
+- 2.16.0
+
+Revision 1.40  2006/08/30 17:51:42  havner
+- proper paths for XSS (it doesn't seem to be using them anyway)
+
+Revision 1.39  2006/08/22 20:52:53  grzegol
+- added .pc file, rel. 2
+
+Revision 1.38  2006/08/22 17:27:40  freetz
+- 2.15.7
+
+Revision 1.37  2006/08/12 09:38:45  ankry
+- formatting
+
+Revision 1.36  2006/08/10 20:36:30  qboosh
+- pl fix
+
+Revision 1.35  2006/08/10 19:47:52  freetz
+- don't package files twice, rel.2
+
+Revision 1.34  2006/08/10 18:39:22  freetz
+- adapted to HEAD version
+
+Revision 1.33  2006/08/10 18:23:12  freetz
+- missing files section added
+
+Revision 1.32  2006/08/10 18:17:01  freetz
+- 2.15.6, merged havner's masterpiece from AC-branch, you rule dude!
+
+Revision 1.31  2006/08/08 17:12:41  havner
+- O: xscreensaver-gnome2
+
+Revision 1.30  2006/07/26 18:44:19  freetz
+- 2.15.5
+
+Revision 1.29  2006/07/14 14:55:33  freetz
+- 2.15.4, updated BR/file list, --as-needed support
+
+Revision 1.28  2006/06/12 19:28:13  freetz
+- 2.15.3, update BR
+
+Revision 1.27  2006/06/10 21:07:02  freetz
+- cleanup
+
+Revision 1.26  2006/06/10 21:06:41  freetz
+- 2.15.2, GNOME 2.15.x deps, updated file list
+
+Revision 1.25  2006/06/06 13:32:53  qboosh
+- merged update to 2.14.2 from AC-branch
+
+Revision 1.24  2006/05/27 00:23:41  qboosh
+- merged deps update from AC-branch
+
+Revision 1.23.2.3  2006/05/18 22:24:27  baggins
+- release 3
+- strict reqs
+
+Revision 1.23.2.2  2006/05/15 17:54:34  baggins
+- rel 2
+- fixed BRs
+
+Revision 1.23.2.1  2006/05/15 16:34:38  baggins
+- from HEAD
+
+Revision 1.23  2006/04/10 19:48:10  freetz
+- merged from DEVEL and updated to 2.14.1
 
 Revision 1.22.2.6  2006/03/13 15:16:58  freetz
 - 2.14.0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-screensaver.spec?r1=1.22.2.7&r2=1.22.2.8&f=u



More information about the pld-cvs-commit mailing list