[cinnamon-screensaver] update to 2.0.1
leigh123linux
leigh123linux at fedoraproject.org
Fri Oct 18 16:21:06 UTC 2013
commit 0201546f7e8823f03b2dff7ea31262efcd4ea8ce
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Fri Oct 18 17:21:03 2013 +0100
update to 2.0.1
.gitignore | 1 +
cinnamon-screensaver.spec | 34 ++++++++++++----------------------
sources | 2 +-
3 files changed, 14 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9009c65..b4a0875 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/cinnamon-screensaver-1.8.1.git4f741eb.tar.gz
/cinnamon-screensaver-1.9.1.tar.gz
/cinnamon-screensaver-2.0.0.tar.gz
+/cinnamon-screensaver-2.0.1.tar.gz
diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index d4c423b..c9b78f9 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -1,4 +1,4 @@
-%global _internal_version 4f741eb
+#global _internal_version 4f741eb
%global dbus_glib_version 0.74
%global redhat_menus_version 5.0.1
@@ -6,8 +6,8 @@
Summary: Cinnamon Screensaver
Name: cinnamon-screensaver
-Version: 2.0.0
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
@@ -63,36 +63,26 @@ make V=1 %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
-cp -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/cinnamon-screensaver.desktop \
-$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/cinnamon2d-screensaver.desktop
-
-sed -i -e '9iAutostartCondition=GNOME3 if-session cinnamon' $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/cinnamon-screensaver.desktop
-desktop-file-install \
- --delete-original \
- --remove-only-show-in=Xfce \
- --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/cinnamon-screensaver.desktop
-
-sed -i -e '9iAutostartCondition=GNOME3 if-session cinnamon2d' $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/cinnamon2d-screensaver.desktop
desktop-file-install \
--delete-original \
--remove-only-show-in=Xfce \
- --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/cinnamon2d-screensaver.desktop
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-screensaver.desktop
%files
%doc AUTHORS NEWS README COPYING
%{_bindir}/cinnamon-screensaver*
-# remove conflicting files
+%{_datadir}/applications/cinnamon-screensaver.desktop
%{_datadir}/dbus-1/services/org.cinnamon.ScreenSaver.service
-%{_libexecdir}/*
-%config %{_sysconfdir}/pam.d/*
-%{_sysconfdir}/xdg/autostart/cinnamon-screensaver.desktop
-%{_sysconfdir}/xdg/autostart/cinnamon2d-screensaver.desktop
-%doc %{_mandir}/man1/*.1.gz
+%{_libexecdir}/cinnamon-screensaver-dialog
+%config %{_sysconfdir}/pam.d/cinnamon-screensaver
+%{_mandir}/man1/cinnamon-screensaver*.1.*
%changelog
+* Fri Oct 18 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.1-1
+- update to 2.0.1
+
* Thu Oct 17 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-2
- Stop starting in gnome-shell as it pissed off the gnome devs
diff --git a/sources b/sources
index ab77a0a..d340d72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5800a3d4925e599687728c89fbe3625 cinnamon-screensaver-2.0.0.tar.gz
+833537a28f67ac8881299cfe5491fd27 cinnamon-screensaver-2.0.1.tar.gz
More information about the scm-commits
mailing list