rpms/workrave/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 workrave.spec, 1.7, 1.8

[Tomas Mraz (tmraz)]

Author: tmraz

Update of /cvs/extras/rpms/workrave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16158

Modified Files:
	.cvsignore sources workrave.spec 
Log Message:
* Mon Mar 26 2007 Tomas Mraz <tmraz at redhat.com> - 1.8.4-2
- new upstream version
- add datadir/pixmaps/workrave to files (#233815)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/workrave/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2006 15:13:48 -0000	1.4
+++ .cvsignore	26 Mar 2007 08:08:25 -0000	1.5
@@ -1 +1 @@
-workrave-1.8.3.tar.gz
+workrave-1.8.4-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/workrave/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2006 15:13:48 -0000	1.4
+++ sources	26 Mar 2007 08:08:25 -0000	1.5
@@ -1 +1 @@
-e1fe49f6fdf9d725bd21d50e2e0dc20d  workrave-1.8.3.tar.gz
+ddb2d1d86b4adbe00fe662f0015bc6b4  workrave-1.8.4-2.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/extras/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- workrave.spec	7 Sep 2006 18:55:39 -0000	1.7
+++ workrave.spec	26 Mar 2007 08:08:25 -0000	1.8
@@ -1,12 +1,13 @@
 Name: workrave
-Version: 1.8.3
+Version: 1.8.4
 Release: 2%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag at wieers.com> and Steve Ratcliffe
 License: GPL
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
+# For some reason the upstream tarball contains the -2 added to the version.
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-2.tar.gz
 Source1: workrave.desktop
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +25,7 @@
 take micro-pauses, rest breaks and restricts you to your daily limit.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
 %build
 if [ ! -x configure ]; then
@@ -60,10 +61,15 @@
 %{_libdir}/bonobo/servers/Workrave-Control.server
 %{_libexecdir}/workrave-applet
 %{_datadir}/gnome-2.0/ui/GNOME_WorkraveApplet.xml
+%dir %{_datadir}/pixmaps/workrave
 %{_datadir}/pixmaps/workrave/workrave-icon-huge.png
 %{_datadir}/applications/fedora-workrave.desktop
 
 %changelog
+* Mon Mar 26 2007 Tomas Mraz <tmraz at redhat.com> - 1.8.4-2
+- new upstream version
+- add datadir/pixmaps/workrave to files (#233815)
+
 * Thu Sep  7 2006 Tomas Mraz <tmraz at redhat.com> - 1.8.3-2
 - rebuilt for FC6