[workrave] update to 1.9.911 checkout from github, build for gnome 3
Tom Callaway
spot at fedoraproject.org
Tue Jan 8 16:03:09 UTC 2013
commit bc85e93df1949846376c83b14e4835c87fb98ee1
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue Jan 8 11:05:11 2013 -0500
update to 1.9.911 checkout from github, build for gnome 3
.gitignore | 1 +
sources | 2 +-
workrave-6f9bc5d-fix-configure.patch | 12 ++++
workrave-6f9bc5d-fix-desktop-translation.patch | 26 ++++++++
workrave.spec | 79 ++++++++++++++++++------
5 files changed, 101 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a280a1..40160da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
workrave-1.9.1.tar.gz
/workrave-1.9.2.tar.gz
/workrave-1.9.3.tar.gz
+/workrave-1.9.911-6f9bc5d.tar.gz
diff --git a/sources b/sources
index ffe08c2..84bfaa8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5eaf399b38b063053cff1a8527cba8e workrave-1.9.4.tar.gz
+06ebeac26d44672d21ff9534b910c3d4 workrave-1.9.911-6f9bc5d.tar.gz
diff --git a/workrave-6f9bc5d-fix-configure.patch b/workrave-6f9bc5d-fix-configure.patch
new file mode 100644
index 0000000..2c5a4f5
--- /dev/null
+++ b/workrave-6f9bc5d-fix-configure.patch
@@ -0,0 +1,12 @@
+diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac.fix workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac
+--- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac.fix 2013-01-07 12:13:06.000000000 -0500
++++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/configure.ac 2013-01-08 10:05:16.474764630 -0500
+@@ -23,7 +23,7 @@ AC_CONFIG_SRCDIR([backend/include/ICore.
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADER([config.h])
+
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign silent-rules])
++AM_INIT_AUTOMAKE([-Wall -Wno-portability])
+ dnl AM_SILENT_RULES([yes])
+
+ GNOME_SHELL_VERSION=3.6.2
diff --git a/workrave-6f9bc5d-fix-desktop-translation.patch b/workrave-6f9bc5d-fix-desktop-translation.patch
new file mode 100644
index 0000000..228be2d
--- /dev/null
+++ b/workrave-6f9bc5d-fix-desktop-translation.patch
@@ -0,0 +1,26 @@
+diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po.fixtrans workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po
+--- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po.fixtrans 2013-01-08 10:35:25.349987436 -0500
++++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/pl.po 2013-01-08 10:35:40.498995191 -0500
+@@ -904,8 +904,7 @@ msgstr "Opóźnienie trwa:"
+ msgid ""
+ "Assists in the prevention and recovery of Repetitive Strain Injury (RSI)"
+ msgstr ""
+-"Pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia\n"
+-"- RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję"
++"Pomaga w zapobieganiu urazom na skutek chronicznego przeciążenia - RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję"
+
+ #: ../frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc:55
+ #: ../frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc:79
+diff -up workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po.fixtrans workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po
+--- workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po.fixtrans 2013-01-08 10:35:05.755978135 -0500
++++ workrave-6f9bc5d9d66c6042923ca39367f54db39ecd914a/po/ru.po 2013-01-08 10:35:16.631982923 -0500
+@@ -760,8 +760,7 @@ msgstr "Расположение в си
+ msgid ""
+ "Assists in the prevention and recovery of Repetitive Strain Injury (RSI)"
+ msgstr ""
+-"Эта программа помогает в предупреждении и лечении туннельного синдрома\n "
+-"запястья и снятии общего мышечного напряжения."
++"Эта программа помогает в предупреждении и лечении туннельного синдрома запястья и снятии общего мышечного напряжения."
+
+ #: ../frontend/gtkmm/src/gnome_applet/GNOME_WorkraveApplet.xml.in.h:1
+ #: ../frontend/gtkmm/src/gnome_applet3/WorkraveApplet.c:874
diff --git a/workrave.spec b/workrave.spec
index cc1dd77..660e56c 100644
--- a/workrave.spec
+++ b/workrave.spec
@@ -1,22 +1,35 @@
+%global commit 6f9bc5d9d66c6042923ca39367f54db39ecd914a
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20130107
+
Name: workrave
-Version: 1.9.4
-Release: 6%{?dist}
+Version: 1.9.911
+Release: 0.1.%{commitdate}git%{shortcommit}%{?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://www.workrave.org/
-Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
-
-BuildRequires: gtkmm24-devel
-BuildRequires: GConf2-devel
+# Using github checkout:
+# https://github.com/rcaelers/workrave
+# Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
+Source0: https://github.com/rcaelers/workrave/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Patch0: workrave-6f9bc5d-fix-configure.patch
+Patch1: workrave-6f9bc5d-fix-desktop-translation.patch
+
+BuildRequires: gnome-panel-devel
+BuildRequires: glib2-devel >= 2.28.0
+BuildRequires: gtk3-devel >= 3.0.0
+BuildRequires: libsigc++20-devel >= 2.2.4.2
+BuildRequires: glibmm24-devel >= 2.28.0
+BuildRequires: gtkmm30-devel >= 3.0.0
+# BuildRequires: GConf2-devel
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: libXmu-devel
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
BuildRequires: dbus-devel
-BuildRequires: dbus-glib-devel
BuildRequires: gstreamer-devel
BuildRequires: intltool
BuildRequires: python-cheetah
@@ -29,8 +42,18 @@ Workrave is a program that assists in the recovery and prevention of
Repetitive Strain Injury (RSI). The program frequently alerts you to
take micro-pauses, rest breaks and restricts you to your daily limit.
+%package devel
+Requires: %{name} = %{version}-%{release}
+Summary: Development files for workrave
+
+%description devel
+Development files for workrave.
+
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{commit}
+%patch0 -p1 -b .fix
+%patch1 -p1 -b .fixpl
+touch ChangeLog
%build
if [ ! -x configure ]; then
@@ -38,38 +61,58 @@ if [ ! -x configure ]; then
NOCONFIGURE=1 ./autogen.sh
fi
-%configure --enable-dbus --disable-xml
+%configure --enable-dbus --disable-xml --enable-gnome3 --disable-static
%{__make}
%install
-%{__rm} -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a
%find_lang %{name}
desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
--remove-category GTK \
--delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
-
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
%files -f %{name}.lang
-%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README
%{_bindir}/*
%{_datadir}/workrave/
%{_datadir}/sounds/workrave/
-%{_datadir}/icons/hicolor/48x48/apps/workrave-icon-huge.png
-%{_datadir}/icons/hicolor/scalable/apps/workrave-sheep.svg
+%{_datadir}/icons/hicolor/16x16/apps/workrave.png
+%{_datadir}/icons/hicolor/24x24/apps/workrave.png
+%{_datadir}/icons/hicolor/32x32/apps/workrave.png
+%{_datadir}/icons/hicolor/48x48/apps/workrave.png
+%{_datadir}/icons/hicolor/64x64/apps/workrave.png
+%{_datadir}/icons/hicolor/96x96/apps/workrave.png
+%{_datadir}/icons/hicolor/128x128/apps/workrave.png
+%{_datadir}/icons/hicolor/scalable/workrave-sheep.svg
+%{_datadir}/icons/hicolor/scalable/apps/workrave.svg
%{_datadir}/applications/fedora-workrave.desktop
%{_datadir}/dbus-1/services/org.workrave.Workrave.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.WorkraveAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.workrave.*.xml
+%{_datadir}/gnome-panel/4.0/applets/org.workrave.WorkraveApplet.panel-applet
+%{_datadir}/gnome-panel/ui/workrave-gnome-applet-menu.xml
+%{_datadir}/gnome-shell/extensions/workrave at workrave.org/
+%{_libdir}/girepository-1.0/Workrave-1.0.typelib
+%{_libexecdir}/workrave-applet
+%{_libdir}/libworkrave-private-1.0.so.*
+
+%files devel
+%{_datadir}/gir-1.0/Workrave-1.0.gir
+%{_libdir}/libworkrave-private-1.0.so
%changelog
+* Tue Jan 8 2013 Tom Callaway <spot at fedoraproject.org> - 1.9.911-0.1.20130107git6f9bc5d
+- update to 1.9.911 checkout from github
+- build for gnome3
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list