[xscreensaver] A bit spec file cleanup

Mamoru Tasaka mtasaka at fedoraproject.org
Fri Sep 21 02:31:55 UTC 2012


commit b3accd787d2a7e9fae2146e8b5c6eb4da9b14046
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Fri Sep 21 11:31:35 2012 +0900

    A bit spec file cleanup

 xscreensaver.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 005273e..d088698 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -14,10 +14,10 @@
 
 %undefine extrarel
 
-%if 0%{?fedora} >= 12
-%define default_text  %{_datadir}/doc/HTML/readme/en_US/README-en_US.txt
+%if 0%{?fedora}
+%define default_text  %{_sysconfdir}/fedora-release
 %else
-%define default_text  %{_datadir}/doc/HTML/README-Accessibility
+%define default_text  %{_sysconfdir}/system-release
 %endif
 %define default_URL   http://planet.fedoraproject.org/rss20.xml
 
@@ -32,7 +32,7 @@ Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{mainversion}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}
+Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
 Epoch:           1
 License:         MIT
 Group:           Amusements/Graphics
@@ -118,7 +118,7 @@ BuildRequires:   gtk2-devel
 BuildRequires:   libjpeg-devel
 BuildRequires:   libglade2-devel
 %if 0%{?fedora}
-BuildRequires:   fedora-release-notes
+BuildRequires:   fedora-release
 %endif
 # For --with-login-manager option
 %if 0%{?fedora} >= 14
@@ -127,6 +127,7 @@ BuildRequires:   fedora-release-notes
 %endif
 Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
+# For xdg-open
 Requires:        xdg-utils
 %if ! %{split_getimage}
 Requires:        xorg-x11-resutils
@@ -141,6 +142,7 @@ Obsoletes:       xscreeensaver-tests < %{epoch}:%{version}-%{release}
 Summary:         A base package for screensavers
 Group:           Amusements/Graphics
 Requires:        %{name}-base = %{epoch}:%{version}-%{release}
+# For appres, etc
 Requires:        xorg-x11-resutils
 
 %package extras
@@ -773,7 +775,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/update-xscreensaver-hacks
 %endif
 
-%if %{?fedora} >= 18
+%if 0%{?fedora} >= 18
 # In the case that pam setting is edited locally by sysadmin:
 if ! grep -q '^account' %{_sysconfdir}/pam.d/xscreensaver
 then
@@ -822,6 +824,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Sep 21 2012 Mamoru Tasaka <mtasaka at fedoraproject.org>
+- A bit spec file cleanup
+
 * Mon Aug 27 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.19-4
 - Remove warning from calling glLighti with float argument in engine.c
 


More information about the scm-commits mailing list