Author: freetz                       Date: Fri Aug 11 19:31:56 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged 0.14 update from AC-branch, apidocs subpkg, HEAD deps

---- Files affected:
SPECS:
   planner.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/planner.spec
diff -u SPECS/planner.spec:1.31 SPECS/planner.spec:1.32
--- SPECS/planner.spec:1.31     Wed Nov  2 19:33:22 2005
+++ SPECS/planner.spec  Fri Aug 11 21:31:51 2006
@@ -1,45 +1,48 @@
 # $Revision$, $Date$
-# TODO
-# - add bcond evolution ? - It's experimental code
 #
 # Conditional build:
-%bcond_with    pgsql   # without PostgreSQL storage module
+%bcond_without eds     # without evolution-data-sever support
+%bcond_without pgsql   # without PostgreSQL storage module
 #
 Summary:       A project management program that can help build plans, and 
track the progress
 Summary(pl):   System zarządzania projektem pomocny przy planowaniu i 
śledzeniu postępu
 Summary(pt_BR):        Planner é um programa para gerenciamento de projetos
 Name:          planner
-Version:       0.13
-Release:       4
+Version:       0.14
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       
http://ftp.gnome.org/pub/GNOME/sources/planner/0.13/%{name}-%{version}.tar.bz2
-# Source0-md5: acc2e2075bc489e849843009d6583cc0
+Source0:       
http://ftp.gnome.org/pub/GNOME/sources/planner/0.14/%{name}-%{version}.tar.bz2
+# Source0-md5: af54ef691bfa7fc24c7ad858d55fed4a
 Patch0:                %{name}-desktop.patch
 URL:           http://www.imendio.com/projects/planner/
-BuildRequires: GConf2-devel
-BuildRequires: gnome-vfs2-devel >= 2.0.2
-BuildRequires: gtk-doc >= 1.0
-BuildRequires: intltool >= 0.30
-BuildRequires: libgnomeprintui-devel >= 2.6.0
-BuildRequires: libgsf-devel >= 1.4.0
-BuildRequires: libxslt-devel >= 1.1.0
+BuildRequires: GConf2-devel >= 2.14.0
+BuildRequires: automake
+BuildRequires: gnome-vfs2-devel >= 2.15.91
+BuildRequires: gtk-doc >= 1.7
+BuildRequires: intltool >= 0.35
+BuildRequires: libgnomeprintui-devel >= 2.12.1
+BuildRequires: libgsf-devel >= 1.14.1
+BuildRequires: libxslt-devel >= 1.1.17
 BuildRequires: pkgconfig
+BuildRequires: python-devel >= 1:2.3.2
+BuildRequires: python-pygtk-devel >= 2:2.9.6
+BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: scrollkeeper
+%if %{with eds}
+BuildRequires: evolution-data-server-devel >= 1.7.91
+%endif
 %if %{with pgsql}
-BuildRequires: libgda-devel >= 1.0
-BuildRequires: libgda-devel < 1.9
+BuildRequires: libgda-devel >= 1:1.2.3
 BuildRequires: postgresql-devel
 %endif
-BuildRequires: python-devel >= 2.2
-BuildRequires: python-pygtk-devel >= 1:2.0.0
-BuildRequires: rpmbuild(macros) >= 1.197
-BuildRequires: scrollkeeper
-Requires:      hicolor-icon-theme
-Requires(post,preun):  GConf2
-Requires(post,postun): desktop-file-utils
+Requires(post,preun):  GConf2 >= 2.14.0
 Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): desktop-file-utils
 Requires(post,postun): scrollkeeper
 Requires(post,postun): shared-mime-info
+%{?with_eds:Requires:  evolution-data-server >= 1.7.91}
+Requires:      hicolor-icon-theme
 Obsoletes:     libmrproject
 Obsoletes:     mrproject
 Obsoletes:     python-libmrproject
@@ -63,9 +66,9 @@
 Summary(pl):   Pliki nagłówkowe biblioteki planner
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 2.0.4
-Requires:      libgsf-devel >= 1.4.0
-Requires:      libxml2-devel >= 2.5.4
+Requires:      glib2-devel >= 1:2.12.1
+Requires:      libgsf-devel >= 1.14.1
+Requires:      libxml2-devel >= 1:2.6.26
 Obsoletes:     libmrproject-devel
 Obsoletes:     libmrproject-static
 
@@ -75,12 +78,24 @@
 %description devel -l pl
 Pliki nagłówkowe biblioteki planner.
 
+%package apidocs
+Summary:       libplanner API documentation
+Summary(pl):   Dokumentacja API libplanner
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+libplanner API documentation.
+
+%description apidocs -l pl
+Dokumentacja API libplanner.
+
 %package storage-pgsql
 Summary:       PostgreSQL storage module for Planner
 Summary(pl):   Moduł przechowywania danych w bazie PostgreSQL dla Plannera
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      gda-postgres
+Requires:      gda-postgres >= 1:1.2.3
 Obsoletes:     libmrproject-storage-pgsql
 Obsoletes:     mrproject-storage-pgsql
 
@@ -96,7 +111,7 @@
 Group:         Libraries/Python
 Requires:      %{name} = %{version}-%{release}
 %pyrequires_eq python-libs
-Requires:      python-pygtk-devel >= 1.99.14
+Requires:      python-pygtk-devel >= 2:2.9.6
 
 %description -n python-planner
 Python binding for Planner library.
@@ -109,8 +124,10 @@
 %patch0 -p1
 
 %build
+cp -f /usr/share/automake/config.sub .
 %configure \
        --disable-update-mimedb \
+       %{?with_eds:--enable-eds} \
        %{?with_pgsql:--enable-database} \
        --enable-gtk-doc \
        --enable-python \
@@ -131,13 +148,10 @@
        omf_dest_dir=%{_omf_dest_dir}
 
 # useless - modules loaded through gmodule
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/{,*/}*.la
-
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/gtk-2.0/*.la
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,globs,magic}
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime/application/*.xml
-rm -r $RPM_BUILD_ROOT%{_datadir}/{application-registry,mime-info}
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,globs,magic}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/{,*/}*.la
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.la
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -146,10 +160,11 @@
 
 %post
 /sbin/ldconfig
+%gconf_schema_install %{name}.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
-umask 022
-update-mime-database %{_datadir}/mime ||:
+%update_mime_database
+%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall %{name}.schemas
@@ -158,10 +173,8 @@
 /sbin/ldconfig
 %scrollkeeper_update_postun
 %update_desktop_database_postun
-if [ $1 = 0 ]; then
-       umask 022
-       update-mime-database %{_datadir}/mime
-fi
+%update_mime_database
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -173,26 +186,22 @@
 %dir %{_libdir}/%{name}/file-modules
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/storage-modules
-%dir %{_libdir}/%{name}/views
 
-%attr(755,root,root) %{_libdir}/%{name}/libgantt-task.so
 %attr(755,root,root) %{_libdir}/%{name}/file-modules/*.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 %if %{with pgsql}
 %exclude %{_libdir}/%{name}/storage-modules/*sql.so
 %endif
 %attr(755,root,root) %{_libdir}/%{name}/storage-modules/*.so
-%attr(755,root,root) %{_libdir}/%{name}/views/*.so
 
-%{_desktopdir}/*
-%{_datadir}/mime/packages/*.xml
-%{_datadir}/%{name}
-%{_iconsdir}/hicolor/*/*/*.png
-%dir %{_pixmapsdir}/%{name}
-%{_pixmapsdir}/*.png
-%{_pixmapsdir}/*/*.png
-%{_omf_dest_dir}/*
-%{_examplesdir}/%{name}-%{version}
+%{_datadir}/%{name}                                                            
                                                                  
+%{_desktopdir}/*                                                               
                                                                  
+%{_iconsdir}/hicolor/*/*/*.png                                                 
                                                                  
+%{_pixmapsdir}/*.png                                                           
                                                                  
+%{_datadir}/mime/packages/*.xml                                                
                                                                  
+%{_omf_dest_dir}/planner-C.omf                                                 
                                                                  
+%lang(eu) %{_omf_dest_dir}/planner-eu.omf                                      
                                                                  
+%{_examplesdir}/%{name}-%{version}                                             
                                                                  
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %files devel
@@ -201,6 +210,9 @@
 %attr(755,root,root) %{_libdir}/libplanner*.so
 %{_includedir}/planner-1.0
 %{_pkgconfigdir}/*.pc
+
+%files apidocs
+%defattr(644,root,root,755)
 %{_gtkdocdir}/libplanner
 
 %if %{with pgsql}
@@ -211,7 +223,7 @@
 
 %files -n python-planner
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/gtk-2.0/planner.so
+%attr(755,root,root) %{py_sitedir}/planner*.so
 
 %define        date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -219,6 +231,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2006/08/11 19:31:51  freetz
+- merged 0.14 update from AC-branch, apidocs subpkg, HEAD deps
+
 Revision 1.31  2005/11/02 18:33:22  paladine
 - proper license
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/planner.spec?r1=1.31&r2=1.32&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to