Author: kiesiu Date: Mon Apr 4 20:44:55 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.0.0; merged from DEVEL
---- Files affected: packages/gnome-screensaver: gnome-screensaver.spec (1.72 -> 1.73) ---- Diffs: ================================================================ Index: packages/gnome-screensaver/gnome-screensaver.spec diff -u packages/gnome-screensaver/gnome-screensaver.spec:1.72 packages/gnome-screensaver/gnome-screensaver.spec:1.73 --- packages/gnome-screensaver/gnome-screensaver.spec:1.72 Fri Apr 1 21:02:07 2011 +++ packages/gnome-screensaver/gnome-screensaver.spec Mon Apr 4 22:44:50 2011 @@ -2,37 +2,38 @@ Summary: GNOME screensaver Summary(pl.UTF-8): Wygaszacz ekranu GNOME Name: gnome-screensaver -Version: 2.30.2 +Version: 3.0.0 Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/2.30/%{name}-%{version}.tar.bz2 -# Source0-md5: 0fbe6e610e6847ac1e69d49b1e1f0582 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/3.0/%{name}-%{version}.tar.bz2 +# Source0-md5: 8a346e84eedcddd89d145acb45999894 Source1: %{name}.pamd -Source2: %{name}-xscreensaver.tar.gz -# Source2-md5: 58ad753724418430fa93f02558056eab URL: http://live.gnome.org/GnomeScreensaver -BuildRequires: GConf2-devel >= 2.26.0 -BuildRequires: OpenGL-devel BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1:1.9 -BuildRequires: dbus-glib-devel >= 0.74 +BuildRequires: dbus-glib-devel >= 0.70 BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.20.0 +BuildRequires: glib2-devel >= 1:2.28.0 BuildRequires: gnome-common >= 2.20.0 -BuildRequires: gnome-desktop-devel >= 2.30.0 +BuildRequires: gnome-desktop-devel >= 2.91.5 BuildRequires: gnome-menus-devel >= 2.26.0 -BuildRequires: gtk+2-devel >= 2:2.16.0 +BuildRequires: gsettings-desktop-schemas >= 0.1.7 +BuildRequires: gtk+3-devel >= 3.0.0 BuildRequires: intltool >= 0.40.0 BuildRequires: libgnomekbd-devel >= 2.26.0 -BuildRequires: libnotify-devel BuildRequires: libtool BuildRequires: pam-devel BuildRequires: pkgconfig +BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXScrnSaver-devel -Requires(post,preun): GConf2 -Requires: xdg-menus +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXxf86misc-devel +BuildRequires: xorg-lib-libXxf86vm-devel +Obsoletes: gnome-screensaver-xscreensaver Obsoletes: xscreensaver-gnome2 +Requires: gsettings-desktop-schemas >= 0.1.7 +Suggests: accountservice # sr@Latn vs. sr@latin Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -46,21 +47,8 @@ oknami dialogowymi 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 -a2 +%setup -q %build %{__intltoolize} @@ -70,19 +58,11 @@ %{__autoheader} %{__automake} %configure \ - --enable-pam \ --enable-locking \ - --with-dpms-ext \ --with-mit-ext \ - --with-shadow \ --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xidle-ext \ - --with-xinerama-ext \ - --with-xscreensaverdir=%{_datadir}/xscreensaver \ - --with-xscreensaverhackdir=%{_libdir}/xscreensaver \ - --with-gdm-config=%{_datadir}/gdm/defaults.conf \ --disable-silent-rules + %{__make} %install @@ -93,63 +73,22 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gnome-screensaver -_DIR=$(pwd) -cd %{name}-xscreensaver -# this one is provided by gnome-screensaver -%{__rm} 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} %clean rm -rf $RPM_BUILD_ROOT -%post -%gconf_schema_install gnome-screensaver.schemas - -%preun -%gconf_schema_uninstall gnome-screensaver.schemas - %files -f %{name}.lang %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}/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/gnome-screensaver.directory -%{_datadir}/backgrounds/cosmos -%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service -%{_datadir}/gnome-background-properties/cosmos.xml -%dir %{_desktopdir}/screensavers -%{_desktopdir}/screensavers/cosmos-slideshow.desktop -%{_desktopdir}/screensavers/footlogo-floaters.desktop -%{_desktopdir}/screensavers/personal-slideshow.desktop -%{_desktopdir}/screensavers/popsquares.desktop -%{_desktopdir}/gnome-screensaver-preferences.desktop -%{_pixmapsdir}/* -%{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas %{_sysconfdir}/xdg/autostart/gnome-screensaver.desktop -%{_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) %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -157,9 +96,28 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.73 2011/04/04 20:44:50 kiesiu +- updated to 3.0.0; merged from DEVEL + Revision 1.72 2011/04/01 19:02:07 qboosh - en@shaw locale is now supported (via LANGUAGE) - use __rm macro + +Revision 1.71.2.5 2011/03/28 20:03:03 patrys +- gnome-desktop3 is no more + +Revision 1.71.2.4 2011/03/23 09:56:35 wiget +- up to 2.91.92 + +Revision 1.71.2.3 2011/03/09 13:36:30 wiget +- up to 2.91.91 +- upstream dropped theme support + +Revision 1.71.2.2 2011/02/26 13:34:56 wiget +- 2.91.90 + +Revision 1.71.2.1 2011/02/04 10:31:38 wiget +- up to 2.91.4 Revision 1.71 2010/09/30 14:01:14 megabajt - updated to 2.30.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-screensaver/gnome-screensaver.spec?r1=1.72&r2=1.73&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
