rpms/workrave/F-8 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 workrave.spec, 1.10, 1.11 workrave-1.8.4-applet-crash.patch, 1.1, NONE workrave-1.8.4-applet-fix.patch, 1.1, NONE workrave.desktop, 1.1, NONE

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	.cvsignore sources workrave.spec 
Removed Files:
	workrave-1.8.4-applet-crash.patch 
	workrave-1.8.4-applet-fix.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-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Mar 2007 08:08:25 -0000	1.5
+++ .cvsignore	29 Sep 2008 14:00:03 -0000	1.6
@@ -1 +1 @@
-workrave-1.8.4-2.tar.gz
+workrave-1.9.0-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Mar 2007 08:08:25 -0000	1.5
+++ sources	29 Sep 2008 14:00:03 -0000	1.6
@@ -1 +1 @@
-ddb2d1d86b4adbe00fe662f0015bc6b4  workrave-1.8.4-2.tar.gz
+aaf7371db1200d65b255d95abd5d1fd1  workrave-1.9.0-3.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-8/workrave.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- workrave.spec	22 Aug 2007 21:22:10 -0000	1.10
+++ workrave.spec	29 Sep 2008 14:00:03 -0000	1.11
@@ -1,16 +1,13 @@
 Name: workrave
-Version: 1.8.4
-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}-2.tar.gz
-Source1: workrave.desktop
-Patch1: workrave-1.8.4-applet-crash.patch
-Patch2: workrave-1.8.4-applet-fix.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
@@ -20,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
@@ -28,27 +31,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p2 -b .crash
-%patch2 -p2 -b .appletfix
 
 %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
@@ -56,20 +61,35 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/workrave/
 %{_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++
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.8.5-3
+- Autorebuild for GCC 4.3
+
+* Tue Feb 19 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-2
+- make it build on gcc-4.3
+
+* Mon Jan  7 2008 Tomas Mraz <tmraz at redhat.com> - 1.8.5-1
+- upgrade to latest upstream version
+
 * Wed Aug 22 2007 Tomas Mraz <tmraz at redhat.com> - 1.8.4-4
 - applet counters don't start properly
 - license tag fix


--- workrave-1.8.4-applet-crash.patch DELETED ---


--- workrave-1.8.4-applet-fix.patch DELETED ---


--- workrave.desktop DELETED ---