[slock] 1.2 bump

Petr Šabata psabata at fedoraproject.org
Fri Jan 2 15:58:30 UTC 2015


commit 006872bb73e49721301fa32f5dc4c4524415c5a7
Author: Petr Šabata <contyk at redhat.com>
Date:   Fri Jan 2 16:58:38 2015 +0100

    1.2 bump

 .gitignore                                       |    1 +
 slock-1.1-config.patch => slock-1.2-config.patch |    4 ++--
 slock.spec                                       |   16 ++++++++++------
 sources                                          |    2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e4fd234..1b9b937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 slock-0.9.tar.gz
 /slock-1.0.tar.gz
 /slock-1.1.tar.gz
+/slock-1.2.tar.gz
diff --git a/slock-1.1-config.patch b/slock-1.2-config.patch
similarity index 77%
rename from slock-1.1-config.patch
rename to slock-1.2-config.patch
index 50bb2e5..453b22f 100644
--- a/slock-1.1-config.patch
+++ b/slock-1.2-config.patch
@@ -1,11 +1,11 @@
 diff --git a/config.mk b/config.mk
-index 982d7a6..76b01f6 100644
+index 067cfc7..c931b1d 100644
 --- a/config.mk
 +++ b/config.mk
 @@ -15,8 +15,8 @@ LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
  
  # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -DCOLOR1=\"black\" -DCOLOR2=\"\#005577\"
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
 -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 -LDFLAGS = -s ${LIBS}
 +CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
diff --git a/slock.spec b/slock.spec
index 50addce..ca09fab 100644
--- a/slock.spec
+++ b/slock.spec
@@ -1,15 +1,15 @@
 %global _hardened_build 1
 
 Name:           slock
-Version:        1.1
-Release:        7%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Simple X display locker
-Group:          User Interface/X
 License:        MIT
 URL:            http://tools.suckless.org/%{name}
 Source0:        http://dl.suckless.org/tools/%{name}-%{version}.tar.gz
-Patch0:         slock-1.1-config.patch
-BuildRequires:  libX11-devel libXext-devel 
+Patch0:         slock-1.2-config.patch
+BuildRequires:  libX11-deve
+BuildRequires:  libXext-devel
 
 %description
 This is the simplest X screen locker we are aware of.  It is stable and
@@ -30,12 +30,16 @@ make %{?_smp_mflags}
 make install PREFIX=%{buildroot}/usr
 
 %files
-%doc README LICENSE
+%license LICENSE
+%doc README
 %attr(4755, root, root) %{_bindir}/%{name}
 # There is no freedesktop.org .desktop file because slock is basically a helper
 # binary for light windowmanagers, and it shouldn't appear in applications menu
 
 %changelog
+* Fri Jan 02 2015 Petr Šabata <contyk at redhat.com> - 1.2-1
+- 1.2 bump
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index f1b4411..6a7ebd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3b25abdfd54c81562de4d63d3565be7  slock-1.1.tar.gz
+ee65f6e9f5ce71f3a6088d53b2485430  slock-1.2.tar.gz


More information about the scm-commits mailing list