[cinnamon-screensaver] update to 2.4.0

leigh123linux leigh123linux at fedoraproject.org
Fri Oct 31 15:13:27 UTC 2014


commit 05b6a100a6d1bfcb6d581a76e0b60a0b11fe4735
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Oct 31 15:13:31 2014 +0000

    update to 2.4.0

 .gitignore                |    1 +
 cinnamon-screensaver.spec |   13 ++++++++-----
 sources                   |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe919c1..f788fb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /cinnamon-screensaver-2.2.4.tar.gz
 /cinnamon-screensaver-2.4.0.gitaf298bc.tar.gz
 /cinnamon-screensaver-2.4.0.git8de7ff0.tar.gz
+/cinnamon-screensaver-2.4.0.tar.gz
diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index 48d621a..fb1159d 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -1,4 +1,4 @@
-%global _internal_version      8de7ff0
+#global _internal_version      8de7ff0
 
 %global dbus_glib_version      0.74
 %global redhat_menus_version   5.0.1
@@ -7,7 +7,7 @@
 Summary: Cinnamon Screensaver
 Name:    cinnamon-screensaver
 Version: 2.4.0
-Release: 0.3.git%{_internal_version}%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL:     http://cinnamon.linuxmint.com
 
@@ -15,8 +15,8 @@ URL:     http://cinnamon.linuxmint.com
 #wget https://github.com/linuxmint/cinnamon-screensaver/archive/%{version}.tar.gz -O cinnamon-screensaver-%{version}.tar.gz
 # for git
 # wget https://github.com/linuxmint/cinnamon-screensaver/tarball/%%{_internal_version} -O cinnamon-screensaver-%%{version}.git%%{_internal_version}.tar.gz
-Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.git%{_internal_version}.tar.gz
-#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz
+#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/cinnamon-screensaver-%%{version}.git%%{_internal_version}.tar.gz
+Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz
 
 Patch0:  cinnamon-screensaver-2.20.0-selinux-permit.patch
 Patch1:  revert_58a522e.patch
@@ -49,7 +49,7 @@ Conflicts: xscreensaver < 1:5.00-19
 cinnamon-screensaver is a screen saver and locker.
 
 %prep
-%setup -q -n linuxmint-%{name}-%{_internal_version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
@@ -81,6 +81,9 @@ desktop-file-install                                     \
 %{_mandir}/man1/cinnamon-screensaver*.1.*
 
 %changelog
+* Fri Oct 31 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.0-1
+- update to 2.4.0
+
 * Fri Oct 03 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.0-0.3.git8de7ff0
 - readd revert 58a522e commit
 
diff --git a/sources b/sources
index d8c41a7..4da09f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcf52cb7cc25221da3248eb418355335  cinnamon-screensaver-2.4.0.git8de7ff0.tar.gz
+4a1b65af2f340f0b6efcfbf0cde46b4d  cinnamon-screensaver-2.4.0.tar.gz


More information about the scm-commits mailing list