[wmclock] New version (rhbz#828150)

[raorn]

commit 6a43ec6fb3b5f742e860806539c1f773c675bfce
Author: Alexey I. Froloff <raorn at raorn.name>
Date:   Mon Jun 4 16:56:14 2012 +0400

    New version (rhbz#828150)
    
    - Applied year display patch from Debian (rhbz#828150)

 .gitignore                                  |    1 +
 sources                                     |    2 +-
 wmclock-1.0.14-debian-12-year-display.patch |   19 ++++++++++++++++
 wmclock.spec                                |   32 ++++++++------------------
 4 files changed, 31 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d55ce7..b3d752c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /wmclock-1.0.12.2-pruned.tar.gz
+/wmclock-1.0.14.tar.gz
diff --git a/sources b/sources
index 3934b99..85c4893 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea12799ed9f4342024a52c68ea06466e  wmclock-1.0.12.2-pruned.tar.gz
+15a83f45e2baabec26b22a2153aa2417  wmclock-1.0.14.tar.gz
diff --git a/wmclock-1.0.14-debian-12-year-display.patch b/wmclock-1.0.14-debian-12-year-display.patch
new file mode 100644
index 0000000..6081ecd
--- /dev/null
+++ b/wmclock-1.0.14-debian-12-year-display.patch
@@ -0,0 +1,19 @@
+diff -up wmclock-1.0.14/wmclock.c.debian-12-year-display wmclock-1.0.14/wmclock.c
+--- wmclock-1.0.14/wmclock.c.debian-12-year-display	2010-12-22 15:12:28.000000000 +0300
++++ wmclock-1.0.14/wmclock.c	2012-06-04 15:03:14.165555603 +0400
+@@ -849,7 +849,14 @@ int main(int argc, char **argv)
+ #endif /* !ONLY_SHAPED_WINDOW */
+    for (i = 0; i < NUM_TIME_POSITIONS; i++)
+     {
+-       xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
++      if (enable12HourClock && (!enableYearDisplay))
++       {
++         xPos[i] += timePos24[i];
++       }
++      else
++       {
++         xPos[i] += timePos12[i];
++       }
+     }
+    
+    /* Open the display */
diff --git a/wmclock.spec b/wmclock.spec
index 3875364..bdc1ee6 100644
--- a/wmclock.spec
+++ b/wmclock.spec
@@ -1,23 +1,14 @@
 Name:		wmclock
-Version:	1.0.12.2
-Release:	2%{?dist}
+Version:	1.0.14
+Release:	1%{?dist}
 
 Summary:	Dockable clock applet for WindowMaker
 License:	GPLv2+
 Group:		User Interface/X
 
-Url:		http://www.jmknoble.net/WindowMaker/wmclock
-#
-# Source tarball contains original asclock source code, that is not used
-# during build.  Download original source, unpack and use the following
-# commands to generate "pruned" tarball:
-#
-# ./configure
-# make tar MAKE_CHANGELOG=: EXTRA_DIRS='lang.* xpm' TARBALL='$(TARDIR)-pruned.tar.gz'
-#
-# Original tarball: http://www.jmknoble.net/WindowMaker/wmclock/%{name}-%{version}.tar.gz
-Source:		%{name}-%{version}-pruned.tar.gz
-Patch:		%{name}-1.0.12.2-nopolling.patch
+Url:		http://www.bluestop.org/wmclock/index.html
+Source:		http://www.bluestop.org/wmclock/%{name}-%{version}.tar.gz
+Patch:		%{name}-1.0.14-debian-12-year-display.patch
 
 BuildRequires:	imake libX11-devel libXext-devel libXpm-devel xorg-x11-proto-devel
 
@@ -34,19 +25,12 @@ from asclock, a similar clock for the AfterStep window manager.
 %setup -q
 %patch -p1
 
-for f in README wmclock.man.in; do
-  mv "$f" "$f.save"
-  iconv -f LATIN1 -t UTF-8 < "$f.save" > "$f"
-  touch -r "$f.save" "$f"
-  rm "$f.save"
-done
-
 %build
 ./configure --lang english
 make %{?_smp_mflags} CDEBUGFLAGS="$RPM_OPT_FLAGS"
 
 %install
-%{make_install} install.man install.share
+%{make_install} PREFIX=%{_prefix} install.man install.share
 
 %files
 %doc README COPYING
@@ -55,6 +39,10 @@ make %{?_smp_mflags} CDEBUGFLAGS="$RPM_OPT_FLAGS"
 %{_datadir}/%{name}
 
 %changelog
+* Mon Jun 04 2012 Alexey I. Froloff <raorn at raorn.name> - 1.0.14-1
+- New version (rhbz#828150)
+- Applied year display patch from Debian (rhbz#828150)
+
 * Mon Jun 04 2012 Alexey I. Froloff <raorn at raorn.name> - 1.0.12.2-2
 - Added original tarball URL (rhbz#827136)