|
|
84dbee7 |
|
|
|
8453e9e |
%define gtk2_version 2.7.0
|
|
|
84dbee7 |
%define gnome_vfs2_version 2.6.0
|
|
|
84dbee7 |
%define libgnomeui_version 2.6.0
|
|
|
84dbee7 |
%define libglade2_version 2.5.0
|
|
|
5dd7958 |
%define dbus_version 0.60
|
|
|
84dbee7 |
%define libxml2_version 2.6.0
|
|
|
84dbee7 |
%define gconf2_version 2.6.1
|
|
|
40eb2f6 |
%define redhat_menus_version 5.0.1
|
|
|
b15481e |
%define system_logos_version 1.1.37
|
|
|
8453e9e |
%define gnome_menus_version 2.11.1
|
|
|
8453e9e |
%define libexif_version 0.6.12
|
|
|
84dbee7 |
|
|
|
e544819 |
Summary: GNOME Screensaver
|
|
|
84dbee7 |
Name: gnome-screensaver
|
|
|
86396a2 |
Version: 2.14.0
|
|
|
7839a65 |
Release: 4
|
|
|
84dbee7 |
License: GPL
|
|
|
84dbee7 |
Group: Amusement/Graphics
|
|
|
84dbee7 |
Source0: %{name}-%{version}.tar.bz2
|
|
|
a78af05 |
Source1: gnome-screensaver-hide-xscreensaver.menu
|
|
|
044fafe |
Source2: fedoralogo-floaters-lock-dialog.tar.gz
|
|
|
044fafe |
Source3: gnome-compiler-flags.m4
|
|
|
b15481e |
Source4: fedoralogo-floaters.desktop
|
|
|
aa66082 |
Source5: gnome-logo-white.svg
|
|
|
044fafe |
|
|
|
443cd21 |
Patch0: gnome-screensaver-2.13.91-lock-dialog.patch
|
|
|
581f75c |
Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
|
|
|
57f3516 |
Patch2: gnome-screensaver-2.13.91-shrink-em.patch
|
|
|
911ec91 |
Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch
|
|
|
7839a65 |
Patch4: gnome-screensaver-2.14.0-fix-timeout.patch
|
|
|
044fafe |
|
|
|
84dbee7 |
BuildRoot: %{_tmppath}/%{name}-root
|
|
|
84dbee7 |
URL: http://www.gnome.org
|
|
|
84dbee7 |
BuildRequires: gtk2-devel => %{gtk2_version}
|
|
|
84dbee7 |
BuildRequires: gnome-vfs2-devel => %{gnome_vfs2_version}
|
|
|
84dbee7 |
BuildRequires: libgnomeui-devel => %{libgnomeui_version}
|
|
|
84dbee7 |
BuildRequires: dbus-devel >= %{dbus_version}
|
|
|
84dbee7 |
BuildRequires: libglade2-devel => %{libglade2_version}
|
|
|
84dbee7 |
BuildRequires: libxml2-devel >= %{libxml2_version}
|
|
|
84dbee7 |
BuildRequires: GConf2-devel >= %{gconf2_version}
|
|
|
8453e9e |
BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
|
|
|
8453e9e |
BuildRequires: libexif-devel >= %{libexif_version}
|
|
|
84dbee7 |
BuildRequires: pam-devel
|
|
|
2e69f65 |
BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel
|
|
|
dd7ec4e |
BuildRequires: libXinerama-devel libXmu-devel
|
|
|
2e69f65 |
# this is here because the configure tests look for protocol headers
|
|
|
baf926e |
BuildRequires: xorg-x11-proto-devel
|
|
|
84dbee7 |
Requires: gtk2 >= %{gtk2_version}
|
|
|
84dbee7 |
Requires: gnome-vfs2 >= %{gnome_vfs2_version}
|
|
|
84dbee7 |
Requires: libgnomeui >= %{libgnomeui_version}
|
|
|
84dbee7 |
Requires: dbus-glib >= %{dbus_version}
|
|
|
84dbee7 |
Requires: libglade2 >= %{libglade2_version}
|
|
|
84dbee7 |
Requires: libxml2 >= %{libxml2_version}
|
|
|
84dbee7 |
Requires: GConf2 >= %{gconf2_version}
|
|
|
a78af05 |
Requires: redhat-menus >= %{redhat_menus_version}
|
|
|
b15481e |
Requires: fedora-logos >= %{system_logos_version}
|
|
|
c85d367 |
|
|
|
84dbee7 |
%description
|
|
|
84dbee7 |
gnome-screensaver is a screen saver and locker that aims to have
|
|
|
84dbee7 |
simple, sane, secure defaults and be well integrated with the desktop.
|
|
|
84dbee7 |
|
|
|
84dbee7 |
%prep
|
|
|
1da694a |
%setup -q -a2
|
|
|
b15481e |
%patch0 -p1 -b .lock-dialog
|
|
|
581f75c |
%patch1 -p1 -b .use-floaters-by-default
|
|
|
a257047 |
%patch2 -p1 -b .shrink-em
|
|
|
911ec91 |
%patch3 -p1 -b .pass-krb-environment
|
|
|
7839a65 |
%patch4 -p1 -b .fix-timeout
|
|
|
84dbee7 |
|
|
|
84dbee7 |
%build
|
|
|
c85d367 |
intltoolize --force
|
|
|
13cb660 |
aclocal
|
|
|
044fafe |
cat %{SOURCE3} >> aclocal.m4
|
|
|
13cb660 |
automake
|
|
|
c85d367 |
autoconf
|
|
|
1e488b8 |
%configure --with-xscreensaverdir=/usr/share/xscreensaver/config \
|
|
|
9cd076f |
--with-xscreensaverhackdir=/usr/libexec/xscreensaver \
|
|
|
3af94d6 |
--with-gdm-config=/etc/X11/gdm/gdm.conf \
|
|
|
348a9cf |
--with-mit-screensaver=no
|
|
|
84dbee7 |
make
|
|
|
84dbee7 |
|
|
|
84dbee7 |
%install
|
|
|
84dbee7 |
rm -rf $RPM_BUILD_ROOT
|
|
|
84dbee7 |
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
|
|
84dbee7 |
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
84dbee7 |
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
|
|
84dbee7 |
|
|
|
84dbee7 |
desktop-file-install --vendor gnome --delete-original \
|
|
|
84dbee7 |
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
|
|
84dbee7 |
--add-only-show-in GNOME \
|
|
|
84dbee7 |
--add-category X-Red-Hat-Base \
|
|
|
84dbee7 |
$RPM_BUILD_ROOT%{_datadir}/applications/*
|
|
|
84dbee7 |
|
|
|
84dbee7 |
%find_lang %{name}
|
|
|
84dbee7 |
|
|
|
a78af05 |
# hide xscreensaver from the menus
|
|
|
40eb2f6 |
install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
|
|
|
044fafe |
# install floaters lock dialog
|
|
|
044fafe |
cp fedoralogo-floaters-lock-dialog* $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes
|
|
|
044fafe |
|
|
|
6dd1cbb |
install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes
|
|
|
b15481e |
|
|
|
6f4b920 |
sed -ie 's@XSL=${DIST_BIN}/xscreensaver-config.xsl@XSL=%{_datadir}/gnome-screensaver/xscreensaver-config.xsl@' \
|
|
|
6f4b920 |
data/migrate-xscreensaver-config.sh
|
|
|
6f4b920 |
sed -ie 's@b=`basename ${FILE} .xml`@b=xscreensaver-`basename ${FILE} .xml`@' \
|
|
|
6f4b920 |
data/migrate-xscreensaver-config.sh
|
|
|
6f4b920 |
|
|
|
6f4b920 |
install -D -m755 data/migrate-xscreensaver-config.sh $RPM_BUILD_ROOT%{_libexecdir}/gnome-screensaver
|
|
|
6f4b920 |
install -D -m644 data/xscreensaver-config.xsl $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
|
|
|
6f4b920 |
|
|
|
aa66082 |
rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-logo-white.svg
|
|
|
aa66082 |
install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-logo-white.svg
|
|
|
aa66082 |
|
|
|
aa66082 |
|
|
|
84dbee7 |
%clean
|
|
|
84dbee7 |
rm -rf $RPM_BUILD_ROOT
|
|
|
84dbee7 |
|
|
|
84dbee7 |
%post
|
|
|
84dbee7 |
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
84dbee7 |
SCHEMAS="gnome-screensaver.schemas"
|
|
|
84dbee7 |
for S in $SCHEMAS; do
|
|
|
84dbee7 |
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
|
|
|
84dbee7 |
done
|
|
|
84dbee7 |
|
|
|
147edb4 |
if rpm -q xscreensaver-extras >& /dev/null || \
|
|
|
147edb4 |
rpm -q xscreensaver-gl-extras >& /dev/null; then
|
|
|
147edb4 |
(cd %{_datadir}/gnome-screensaver/themes; \
|
|
|
147edb4 |
for f in %{_datadir}/xscreensaver/config/*.xml; do
|
|
|
147edb4 |
%{_libexecdir}/gnome-screensaver/migrate-xscreensaver-config.sh $f > /dev/null 2>&1
|
|
|
147edb4 |
done)
|
|
|
147edb4 |
fi
|
|
|
147edb4 |
|
|
|
6f4b920 |
%triggerin -- xscreensaver-extras xscreensaver-gl-extras
|
|
|
6f4b920 |
(cd %{_datadir}/gnome-screensaver/themes; \
|
|
|
6f4b920 |
for f in %{_datadir}/xscreensaver/config/*.xml; do
|
|
|
6f4b920 |
%{_libexecdir}/gnome-screensaver/migrate-xscreensaver-config.sh $f > /dev/null 2>&1
|
|
|
6f4b920 |
done)
|
|
|
6f4b920 |
|
|
|
6f4b920 |
%triggerun -- xscreensaver-extras
|
|
|
6f4b920 |
(cd %{_datadir}/gnome-screensaver/themes; \
|
|
|
6f4b920 |
for f in $(rpm -ql xscreensaver-extras | grep '%{_datadir}/xscreensaver/config/'); do
|
|
|
6f4b920 |
rm -f xscreensaver-$(basename $f .xml).desktop
|
|
|
6f4b920 |
done)
|
|
|
6f4b920 |
|
|
|
6f4b920 |
%triggerun -- xscreensaver-gl-extras
|
|
|
6f4b920 |
(cd %{_datadir}/gnome-screensaver/themes; \
|
|
|
6f4b920 |
for f in $(rpm -ql xscreensaver-gl-extras | grep '%{_datadir}/xscreensaver/config/'); do
|
|
|
6f4b920 |
rm -f xscreensaver-$(basename $f .xml).desktop
|
|
|
6f4b920 |
done)
|
|
|
6f4b920 |
|
|
|
84dbee7 |
%files -f %{name}.lang
|
|
|
84dbee7 |
%defattr(-, root, root)
|
|
|
84dbee7 |
%doc AUTHORS ChangeLog NEWS README
|
|
|
84dbee7 |
%{_bindir}/*
|
|
|
84dbee7 |
%{_libexecdir}/*
|
|
|
7b6b87a |
%{_libdir}/pkgconfig/*
|
|
|
84dbee7 |
%{_datadir}/applications/gnome-screensaver-preferences.desktop
|
|
|
84dbee7 |
%{_datadir}/gnome-screensaver/*
|
|
|
a78af05 |
%{_datadir}/pixmaps/backgrounds/*
|
|
|
950f2e6 |
%{_datadir}/pixmaps/gnome-logo-white.svg
|
|
|
85a54ce |
%{_datadir}/desktop-directories/gnome-screensaver.directory
|
|
|
84dbee7 |
%{_sysconfdir}/gconf/schemas/*.schemas
|
|
|
40eb2f6 |
%{_sysconfdir}/xdg/menus/preferences-post-merged/*
|
|
|
85a54ce |
%{_sysconfdir}/xdg/menus/gnome-screensavers.menu
|
|
|
84dbee7 |
%{_sysconfdir}/pam.d/*
|
|
|
84dbee7 |
|
|
|
84dbee7 |
%changelog
|
|
|
7839a65 |
* Tue Apr 4 2006 Ray Strode <rstrode@redhat.com> 2.14.0-4
|
|
|
7839a65 |
- don't ignore idle timers after long suspend
|
|
|
7839a65 |
(bug 183668)
|
|
|
7839a65 |
|
|
|
911ec91 |
* Thu Mar 30 2006 Ray Strode <rstrode@redhat.com> 2.14.0-3
|
|
|
911ec91 |
- refresh kerberos credentials when unlocking screen
|
|
|
911ec91 |
(bug 187341)
|
|
|
911ec91 |
|
|
|
e544819 |
* Sat Mar 25 2006 Ray Strode <rstrode@redhat.com> 2.14.0-2
|
|
|
e544819 |
- Add missing "c" to the word "Screensaver" in summary
|
|
|
e544819 |
(bug 186711).
|
|
|
e544819 |
|
|
|
86396a2 |
* Mon Mar 13 2006 Matthias Clasen <mclasen@redhat.com> 2.14.0-1
|
|
|
86396a2 |
- Update to 2.14.0
|
|
|
86396a2 |
|
|
|
dd7ec4e |
* Wed Mar 01 2006 Karsten Hopp <karsten@redhat.de> 2.13.92-2
|
|
|
dd7ec4e |
- BuildRequires: libXmu-devel
|
|
|
dd7ec4e |
|
|
|
2f19224 |
* Mon Feb 27 2006 Matthias Clasen <mclasen@redhat.com> - 2.13.92-1
|
|
|
2f19224 |
- Update to 2.13.92
|
|
|
2f19224 |
|
|
|
443cd21 |
* Wed Feb 15 2006 Matthias Clasen <mclasen@redhat.com> - 2.13.91-1
|
|
|
443cd21 |
- Update to 2.13.91
|
|
|
443cd21 |
|
|
|
147edb4 |
* Mon Feb 13 2006 Ray Strode <rstrode@redhat.com> - 2.13.90-4
|
|
|
147edb4 |
- migrate xscreensaver screensavers in %%post as well as the
|
|
|
147edb4 |
triggers already there (bug 180984)
|
|
|
147edb4 |
|
|
|
0f79060 |
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.13.90-3.1
|
|
|
0f79060 |
- bump again for double-long bug on ppc(64)
|
|
|
0f79060 |
|
|
|
a257047 |
* Fri Feb 10 2006 Ray Strode <rstrode@redhat.com> - 2.13.90-3
|
|
|
a257047 |
- take some more measures to cut cpu usage down
|
|
|
a257047 |
|
|
|
0d608fd |
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.13.90-2.1
|
|
|
0d608fd |
- rebuilt for new gcc4.1 snapshot and glibc changes
|
|
|
0d608fd |
|
|
|
6f4b920 |
* Tue Jan 31 2006 Ray Strode <rstrode@redhat.com> - 2.13.90-2
|
|
|
6f4b920 |
- try to migrate xscreensaver screensavers (bug 172715)
|
|
|
6f4b920 |
|
|
|
46d03c4 |
* Mon Jan 30 2006 Matthias Clasen <mclasen@redhat.com> - 2.13.90-1
|
|
|
46d03c4 |
- Update to 2.13.90
|
|
|
46d03c4 |
|
|
|
1da694a |
* Sun Jan 22 2006 Ray Strode <rstrode@redhat.com> - 2.13.5-4
|
|
|
1da694a |
- throttle cpu usage in floaters screensaver to allow things
|
|
|
1da694a |
like background compiles to be faster (bug 178496).
|
|
|
1da694a |
|
|
|
15f1cd1 |
* Thu Jan 19 2006 Matthias Clasen <mclasen@redhat.com> - 2.13.5-3
|
|
|
f252791 |
- Slight improvements to the Fedora lock dialog
|
|
|
f252791 |
|
|
|
8453e9e |
* Tue Jan 17 2006 Matthias Clasen <mclasen@redhat.com> - 2.13.5-1
|
|
|
8453e9e |
- Update to 2.13.5
|
|
|
8453e9e |
|
|
|
0eb7e66 |
* Fri Jan 13 2006 Matthias Clasen <mclasen@redhat.com> - 0.0.24-1
|
|
|
0eb7e66 |
- Update to 0.0.24
|
|
|
0eb7e66 |
|
|
|
6629eba |
* Mon Jan 9 2006 Ray Strode <rstrode@redhat.com> - 0.0.23-4
|
|
|
4f2b5a5 |
- don't include .desktop part of theme name in gconf schema
|
|
|
4f2b5a5 |
|
|
|
581f75c |
* Tue Dec 20 2005 Ray Strode <rstrode@redhat.com> - 0.0.23-3
|
|
|
581f75c |
- use fedora floater screensaver by default (bug 176229)
|
|
|
581f75c |
|
|
|
6dd1cbb |
* Tue Dec 20 2005 Ray Strode <rstrode@redhat.com> - 0.0.23-2
|
|
|
6dd1cbb |
- install the right theme file instead of a tarball
|
|
|
6dd1cbb |
|
|
|
b15481e |
* Tue Dec 20 2005 Ray Strode <rstrode@redhat.com> - 0.0.23-1
|
|
|
b15481e |
- Update to 0.0.23
|
|
|
b15481e |
- remove floaters screensaver engine patch (it's upstreamed)
|
|
|
b15481e |
- keep fedora branded parts
|
|
|
b15481e |
|
|
|
044fafe |
* Mon Dec 19 2005 Matthias Clasen <mclasen@redhat.com> - 0.0.22-3
|
|
|
044fafe |
- add floaters lock dialog
|
|
|
044fafe |
|
|
|
c85d367 |
* Sun Dec 18 2005 Ray Strode <rstrode@redhat.com> - 0.0.22-2
|
|
|
c85d367 |
- add floaters screensaver
|
|
|
c85d367 |
|
|
|
4de6084 |
* Thu Dec 15 2005 Matthias Clasen <mclasen@redhat.com> - 0.0.22-1
|
|
|
4de6084 |
- Update to 0.0.22
|
|
|
4de6084 |
|
|
|
27054ba |
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> - 0.0.20-2.1
|
|
|
adb517d |
- rebuilt
|
|
|
adb517d |
|
|
|
5dd7958 |
* Thu Dec 01 2005 John (J5) Palmieri <johnp@redhat.com> - 0.0.20-2
|
|
|
5dd7958 |
- rebuild for new dbus
|
|
|
5dd7958 |
|
|
|
baf926e |
* Mon Nov 21 2005 Ray Strode <rstrode@redhat.com> 0.0.20-1
|
|
|
baf926e |
- upgrade to 0.0.20
|
|
|
baf926e |
|
|
|
a188a4b |
* Thu Nov 10 2005 Ray Strode <rstrode@redhat.com> 0.0.18-2
|
|
|
a188a4b |
- make screensaver background window override redirect (bug 172889).
|
|
|
a188a4b |
|
|
|
fba16a5 |
* Thu Nov 3 2005 Ray Strode <rstrode@redhat.com> 0.0.18-1
|
|
|
fba16a5 |
- Update to 0.0.18
|
|
|
fba16a5 |
|
|
|
303592b |
* Tue Nov 1 2005 Matthias Clasen <mclasen@redhat.com> 0.0.17-4
|
|
|
303592b |
- Use /proc/interrupts
|
|
|
303592b |
|
|
|
2e69f65 |
* Tue Nov 1 2005 Matthias Clasen <mclasen@redhat.com> 0.0.17-2
|
|
|
303592b |
- Switch requires to modular X
|
|
|
2e69f65 |
|
|
|
e3cb3ba |
* Tue Oct 25 2005 Matthias Clasen <mclasen@redhat.com> 0.0.17-1
|
|
|
e3cb3ba |
- Update to 0.0.17
|
|
|
e3cb3ba |
|
|
|
6eb4e5c |
* Sun Oct 16 2005 Matthias Clasen <mclasen@redhat.com> 0.0.16-1
|
|
|
6eb4e5c |
- Update to 0.0.16
|
|
|
6eb4e5c |
|
|
|
348a9cf |
* Fri Oct 14 2005 Matthias Clasen <mclasen@redhat.com> 0.0.15-2
|
|
|
348a9cf |
- Don't use pam_stack (#170703)
|
|
|
348a9cf |
|
|
|
22e6662 |
* Thu Oct 6 2005 Matthias Clasen <mclasen@redhat.com> 0.0.15-1
|
|
|
22e6662 |
- Update to 0.0.15
|
|
|
22e6662 |
|
|
|
3af94d6 |
* Thu Sep 29 2005 Matthias Clasen <mclasen@redhat.com> 0.0.14-1
|
|
|
3af94d6 |
- Update to 0.0.14
|
|
|
3af94d6 |
- Drop upstreamed patches
|
|
|
3af94d6 |
|
|
|
40eb2f6 |
* Tue Sep 27 2005 Ray Strode <rstrode@redhat.com> 0.0.13-5
|
|
|
40eb2f6 |
- Location to copy .menu file changed to preferences-post-merged.
|
|
|
40eb2f6 |
|
|
|
a78af05 |
* Mon Sep 26 2005 Ray Strode <rstrode@redhat.com> 0.0.13-4
|
|
|
a78af05 |
- Copy .menu file to hide xscreensaver from menus (bug 169108).
|
|
|
a78af05 |
|
|
|
b448474 |
* Fri Sep 23 2005 Ray Strode <rstrode@redhat.com> 0.0.13-3
|
|
|
b448474 |
- We don't want the xscreensaver virtual provides
|
|
|
9cd076f |
- Don't use /proc/interrupts
|
|
|
b448474 |
|
|
|
1e488b8 |
* Thu Sep 22 2005 Matthias Clasen <mclasen@redhat.com> 0.0.13-2
|
|
|
1e488b8 |
- Explicitly specify xscreensaver directories
|
|
|
1e488b8 |
- Turn off fast user switching for now
|
|
|
1e488b8 |
|
|
|
84dbee7 |
* Wed Sep 21 2005 Ray Strode <rstrode@redhat.com> 0.0.13-1
|
|
|
84dbee7 |
- Update to 0.0.13
|
|
|
84dbee7 |
|
|
|
84dbee7 |
* Fri Sep 13 2005 David Zeuthen <davidz@redhat.com> 0.0.8-1
|
|
|
84dbee7 |
- Initial package
|
|
|
84dbee7 |
|
|
|
fba16a5 |
|
|
|
6f4b920 |
|