packages: planner/planner-desktop.patch, planner/planner.spec, planner/plan...

[patrys]

Author: patrys                       Date: Wed Nov 25 10:25:13 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.14.4

---- Files affected:
packages/planner:
   planner-desktop.patch (1.3 -> 1.4) , planner.spec (1.42 -> 1.43) , planner-makefile.patch (NONE -> 1.1)  (NEW), planner-missing-semicolon.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/planner/planner-desktop.patch
diff -u packages/planner/planner-desktop.patch:1.3 packages/planner/planner-desktop.patch:1.4
--- packages/planner/planner-desktop.patch:1.3	Wed Nov  2 19:23:19 2005
+++ packages/planner/planner-desktop.patch	Wed Nov 25 11:25:08 2009
@@ -9,7 +9,7 @@
 +Icon=gnome-planner
  Terminal=false
  Type=Application
--Categories=Application;Office;ProjectManagement;
+-Categories=GNOME;GTK;Application;Office;ProjectManagement;
 +Categories=GTK;GNOME;Office;ProjectManagement;
  StartupNotify=true
  MimeType=application/x-planner;

================================================================
Index: packages/planner/planner.spec
diff -u packages/planner/planner.spec:1.42 packages/planner/planner.spec:1.43
--- packages/planner/planner.spec:1.42	Sat Mar 14 01:04:48 2009
+++ packages/planner/planner.spec	Wed Nov 25 11:25:08 2009
@@ -2,20 +2,20 @@
 #
 # Conditional build:
 %bcond_without	eds	# without evolution-data-sever support
-%bcond_without	pgsql	# without PostgreSQL storage module
+%bcond_without	gda3	# without PostgreSQL storage module
 #
 Summary:	A project management program that can help build plans, and track the progress
 Summary(pl.UTF-8):	System zarządzania projektem pomocny przy planowaniu i śledzeniu postępu
 Summary(pt_BR.UTF-8):	Planner é um programa para gerenciamento de projetos
 Name:		planner
-Version:	0.14.3
-Release:	4
+Version:	0.14.4
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/planner/0.14/%{name}-%{version}.tar.bz2
-# Source0-md5:	9aee1307f8b9d643241473791f0efa64
+# Source0-md5:	8fcbd1b55dd037662f7710a28a96bb92
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-missing-semicolon.patch
+Patch1:		%{name}-makefile.patch
 URL:		http://www.imendio.com/projects/planner/
 BuildRequires:	GConf2-devel >= 2.18.0.1
 BuildRequires:	autoconf >= 2.54
@@ -39,9 +39,8 @@
 %if %{with eds}
 BuildRequires:	evolution-data-server-devel >= 1.10.0
 %endif
-%if %{with pgsql}
-BuildRequires:	libgda-devel >= 1:1.2.3
-BuildRequires:	postgresql-devel
+%if %{with gda3}
+BuildRequires:	libgda3-devel
 %endif
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	desktop-file-utils
@@ -97,7 +96,7 @@
 %description apidocs -l pl.UTF-8
 Dokumentacja API libplanner.
 
-%package storage-pgsql
+%package storage-sql
 Summary:	PostgreSQL storage module for Planner
 Summary(pl.UTF-8):	Moduł przechowywania danych w bazie PostgreSQL dla Plannera
 Group:		Libraries
@@ -105,12 +104,13 @@
 Requires:	gda-postgres >= 1:1.2.3
 Obsoletes:	libmrproject-storage-pgsql
 Obsoletes:	mrproject-storage-pgsql
+Obsoletes:	planner-storage-pgsql
 
-%description storage-pgsql
-PostgreSQL storage module for Planner application.
+%description storage-sql
+SQL storage module for Planner application.
 
-%description storage-pgsql -l pl.UTF-8
-Moduł przechowywania danych w bazie PostgreSQL dla Plannera.
+%description storage-sql -l pl.UTF-8
+Moduł przechowywania danych w bazie SQL dla Plannera.
 
 %package -n python-planner
 Summary:	Python binding for Planner library
@@ -129,7 +129,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -142,7 +142,7 @@
 %configure \
 	--disable-update-mimedb \
 	%{?with_eds:--enable-eds} \
-	%{?with_pgsql:--enable-database} \
+	%{?with_gda3:--with-database=gda3} \
 	--enable-gtk-doc \
 	--enable-python \
 	--enable-python-plugin \
@@ -204,7 +204,7 @@
 
 %attr(755,root,root) %{_libdir}/%{name}/file-modules/*.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
-%if %{with pgsql}
+%if %{with gda3}
 %exclude %{_libdir}/%{name}/storage-modules/*sql.so
 %endif
 %attr(755,root,root) %{_libdir}/%{name}/storage-modules/*.so
@@ -231,8 +231,8 @@
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libplanner
 
-%if %{with pgsql}
-%files storage-pgsql
+%if %{with gda3}
+%files storage-sql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/storage-modules/*sql.so
 %endif
@@ -247,6 +247,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2009/11/25 10:25:08  patrys
+- 0.14.4
+
 Revision 1.42  2009/03/14 00:04:48  hawk
 - release 4
 

================================================================
Index: packages/planner/planner-makefile.patch
diff -u /dev/null packages/planner/planner-makefile.patch:1.1
--- /dev/null	Wed Nov 25 11:25:14 2009
+++ packages/planner/planner-makefile.patch	Wed Nov 25 11:25:08 2009
@@ -0,0 +1,15 @@
+--- planner-0.14.4/data/ui/Makefile.am~	2008-07-22 15:41:58.000000000 +0200
++++ planner-0.14.4/data/ui/Makefile.am	2009-11-25 10:54:03.807578899 +0100
+@@ -3,12 +3,10 @@
+ ui_DATA = \
+ 	gantt-view.ui		\
+ 	task-view.ui		\
+-	gantt-view.ui		\
+ 	html-plugin.ui		\
+ 	main-window.ui		\
+ 	resource-view.ui	\
+ 	sql-plugin.ui		\
+-	task-view.ui		\
+ 	xml-planner-plugin.ui	\
+ 	time-table-view.ui	\
+ 	eds-plugin.ui		\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/planner/planner-desktop.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/planner/planner.spec?r1=1.42&r2=1.43&f=u