rpms/osmo/F-9 osmo-0.2.2-tzdata.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 osmo.spec, 1.5, 1.6 sources, 1.4, 1.5

Sun Jul 27 16:48:15 UTC 2008

Author: rishi

Update of /cvs/pkgs/rpms/osmo/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24703

Modified Files:
	.cvsignore osmo.spec sources 
Added Files:
	osmo-0.2.2-tzdata.patch 
Log Message:
* Sun Jul 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.2-1
- Version bump to 0.2.2.
- Added 'Requires: tzdata' and fixed the sources since libical does not provide
  timezone information anymore.
- Added 'BuildRequires: hicolor-icon-theme' and moved icons to
  /usr/share/icons/hicolor from /usr/share/pixmaps.


osmo-0.2.2-tzdata.patch:

--- NEW FILE osmo-0.2.2-tzdata.patch ---
diff -urNp osmo-0.2.2.orig/src/calendar_ical.c osmo-0.2.2/src/calendar_ical.c
--- osmo-0.2.2.orig/src/calendar_ical.c	2008-07-27 20:53:18.000000000 +0530
+++ osmo-0.2.2/src/calendar_ical.c	2008-07-27 20:53:43.000000000 +0530
@@ -46,7 +46,7 @@ ics_initialize_timezone (void) {
 
 gchar *tz_search_paths [] = {
 /* FIXME: doesn't work with libical 0.27 */
-/*    "/usr/share/zoneinfo/",*/
+    "/usr/share/zoneinfo/",
     "/opt/usr/share/libical/zoneinfo/",
     "/usr/share/libical/zoneinfo/",
     "/usr/local/share/libical/zoneinfo/"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/osmo/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2008 18:39:33 -0000	1.4
+++ .cvsignore	27 Jul 2008 16:47:45 -0000	1.5
@@ -1 +1 @@
-osmo-0.2.0.tar.gz
+osmo-0.2.2.tar.gz


Index: osmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osmo/F-9/osmo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- osmo.spec	24 Feb 2008 15:08:30 -0000	1.5
+++ osmo.spec	27 Jul 2008 16:47:45 -0000	1.6
@@ -1,71 +1,101 @@
-Name:			osmo
-Version:		0.2.0
-Release:		2%{?dist}
-Summary:		Personal organizer
-Summary(pl):		Osobisty organizer
-
-Group:			Applications/Productivity
-License:		GPLv2+
-URL:			http://clay.ll.pl/osmo/
-Source0:		http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:		libxml2-devel gtk2-devel gettext desktop-file-utils libical-devel
-BuildRequires:		libgringotts-devel
+Summary:	Personal organizer
+Summary(pl):	Osobisty organizer
+Name:		osmo
+Version:	0.2.2
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Applications/Productivity
+URL:		http://clay.ll.pl/osmo/
+Source0:	http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz
+
+Patch0:		%{name}-%{version}-tzdata.patch
+
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires:	hicolor-icon-theme
+Requires: 	tzdata
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	gtk2-devel
+BuildRequires:	libical-devel
+BuildRequires:	libgringotts-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	libsyncml-devel
+BuildRequires:	libxml2-devel
 
 %description
-Osmo is a handy personal organizer which includes 
-calendar, tasks manager and address book modules. 
-It was designed to be a small, easy to use 
-and good looking PIM tool to help to manage 
-personal information. In current state the organizer 
-is quite convenient in use - for example, user 
-can perform nearly all operations using keyboard. 
-Also, a lot of parameters are configurable 
-to meet user preferences.
-
-%description		-l pl
-Osmo to podrÄ™czny organizer, zawierajÄ…cy kalendarz, 
-menedÅ¼er zadaÅ„ i ksiÄ…Å¼kÄ™ adresowÄ…. W zamierzeniu byÅ‚ maÅ‚ym, 
-prostym w obsÅ‚udze i dobrze wyglÄ…dajÄ…cym 
-menedÅ¼erem informacji osobistych.
-Osmo jest bardzo wygodny - niemal wszystkie operacje 
-moÅ¼na wykonaÄ‡ za pomocÄ… klawiatury.
-Program udostÄ™pnia wiele opcji, ktÃ³re uÅ¼ytkownik moÅ¼e 
-zmieniÄ‡, by program bardziej mu odpowiadaÅ‚.
+Osmo is a handy personal organizer which includes calendar, tasks manager and
+address book modules. It was designed to be a small, easy to use and good
+looking PIM tool to help to manage personal information. In current state the
+organizer is quite convenient in use - for example, user can perform nearly
+all operations using keyboard. Also, a lot of parameters are configurable to
+meet user preferences.
+
+%description -l pl
+Osmo to podrÄ™czny organizer, zawierajÄ…cy kalendarz, menedÅ¼er zadaÅ„ i ksiÄ…Å¼kÄ™
+adresowÄ…. W zamierzeniu byÅ‚ maÅ‚ym, prostym w obsÅ‚udze i dobrze wyglÄ…dajÄ…cym 
+menedÅ¼erem informacji osobistych. Osmo jest bardzo wygodny - niemal wszystkie
+operacje moÅ¼na wykonaÄ‡ za pomocÄ… klawiatury. Program udostÄ™pnia wiele opcji,
+ktÃ³re uÅ¼ytkownik moÅ¼e zmieniÄ‡, by program bardziej mu odpowiadaÅ‚.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
-
+%configure --with-gringrotts --with-libical --with-libsyncml
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-desktop-file-install --vendor="fedora" \
-			--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-			--delete-original \
-			${RPM_BUILD_ROOT}%{_datadir}/applications/osmo.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+
+make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
+
+# icon
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+
+# Remove empty directory.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
+desktop-file-install --vendor="fedora" --delete-original \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc TRANSLATORS AUTHORS COPYING ChangeLog README
-%{_datadir}/pixmaps/*
+%doc AUTHORS
+%doc ChangeLog
+%doc COPYING
+%doc README
+%doc README.syncml
+%doc TRANSLATORS
+%{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_bindir}/osmo
-
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Jul 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.2-1
+- Version bump to 0.2.2.
+- Added 'Requires: tzdata' and fixed the sources since libical does not provide
+  timezone information anymore.
+- Added 'BuildRequires: hicolor-icon-theme' and moved icons to
+  /usr/share/icons/hicolor from /usr/share/pixmaps.
+
 * Sun Feb 24 2008 David Nielsen <gnomeuser at gmail.com> - 0.2.0-2
-- Rebuild for new libical
+- Rebuild for new libical.
 
 * Sat Feb 09 2008 Jakub 'Livio' Rusinek <jakub.rusinek at gmail.com> - 0.2.0-1
 - Mass rebuild for new GCC... Done


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osmo/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2008 18:39:33 -0000	1.4
+++ sources	27 Jul 2008 16:47:45 -0000	1.5
@@ -1 +1 @@
-6960aae8b95eb09bf8d0bf4f8656a080  osmo-0.2.0.tar.gz
+d790c2040fda541765a7db2a6827673c  osmo-0.2.2.tar.gz


