rpms/workrave/F-9 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 workrave.spec, 1.16, 1.17 workrave-1.8.5-gcc43.patch, 1.1, NONE workrave-1.8.5-lock.patch, 1.1, NONE workrave-1.8.5-sigc.patch, 1.2, NONE workrave.desktop, 1.2, NONE

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11063

Modified Files:
	.cvsignore sources workrave.spec 
Removed Files:
	workrave-1.8.5-gcc43.patch workrave-1.8.5-lock.patch 
	workrave-1.8.5-sigc.patch workrave.desktop 
Log Message:
* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Jan 2008 13:28:05 -0000	1.6
+++ .cvsignore	29 Sep 2008 14:14:57 -0000	1.7
@@ -1 +1 @@
-workrave-1.8.5.tar.gz
+workrave-1.9.0-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2008 13:28:05 -0000	1.6
+++ sources	29 Sep 2008 14:14:57 -0000	1.7
@@ -1 +1 @@
-3df48ab5600256fadc11a976f15bcc7a  workrave-1.8.5.tar.gz
+aaf7371db1200d65b255d95abd5d1fd1  workrave-1.9.0-3.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-9/workrave.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- workrave.spec	4 Apr 2008 13:06:22 -0000	1.16
+++ workrave.spec	29 Sep 2008 14:14:57 -0000	1.17
@@ -1,18 +1,13 @@
 Name: workrave
-Version: 1.8.5
-Release: 4%{?dist}
+Version: 1.9.0
+Release: 1%{?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: GPLv2+
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
-# For some reason the upstream tarball contains the -2 added to the version.
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
-Source1: workrave.desktop
-
-Patch1: workrave-1.8.5-gcc43.patch
-Patch2: workrave-1.8.5-lock.patch
-Patch3: workrave-1.8.5-sigc.patch
+# For some reason the upstream tarball contains the -3 added to the version.
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-3.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -22,6 +17,12 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXmu-devel
 BuildRequires:  libXt-devel
+BuildRequires:  gdome2-devel
+BuildRequires:  dbus-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  intltool
+
+Requires: dbus
 
 %description
 Workrave is a program that assists in the recovery and prevention of
@@ -30,28 +31,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .lock
-%patch3 -p1 -b .sigc
 
 %build
 if [ ! -x configure ]; then
   ### Needed for snapshot releases.
   CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{_prefix} --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir}
 else
-  %configure
+  %configure --enable-dbus
 fi
 %{__make}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
 %find_lang %{name}
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
-  %{SOURCE1}
+  --remove-category GTK                                 \
+  --delete-original					\
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -65,14 +67,16 @@
 %{_datadir}/sounds/workrave
 %{_sysconfdir}/sound/events/workrave.soundlist
 %{_libdir}/bonobo/servers/Workrave-Applet.server
-%{_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}/pixmaps/workrave
 %{_datadir}/applications/fedora-workrave.desktop
+%{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
+* Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
+- new upstream version
+
 * Fri Apr  4 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-4
 - fix locking/unlocking with gnome-screensaver (#207058)
 - make it build with current libsigc++


--- workrave-1.8.5-gcc43.patch DELETED ---


--- workrave-1.8.5-lock.patch DELETED ---


--- workrave-1.8.5-sigc.patch DELETED ---


--- workrave.desktop DELETED ---