rpms/basket/EL-5 basket-1.0.2-kdepimenterprise.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 basket.spec, 1.13, 1.14 sources, 1.6, 1.7

Mon Jun 21 09:34:28 UTC 2010

Author: wolfy

Update of /cvs/pkgs/rpms/basket/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2675

Modified Files:
	.cvsignore basket.spec sources 
Added Files:
	basket-1.0.2-kdepimenterprise.patch 
Log Message:
* Fri Jun 18 2010 wolfy at nobugconsulting.ro - 1.0.3.1-7
- adjust spec from F-12 so as to build in EPEL-5


basket-1.0.2-kdepimenterprise.patch:
 basket.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE basket-1.0.2-kdepimenterprise.patch ---
diff -up ./kontact_plugin/basket.desktop.kdepimenterprise ./kontact_plugin/basket.desktop
--- ./kontact_plugin/basket.desktop.kdepimenterprise	2007-10-27 11:19:18.000000000 +0200
+++ ./kontact_plugin/basket.desktop	2007-10-27 11:19:29.000000000 +0200
@@ -5,7 +5,7 @@ Icon=basket
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-KDE-Library=libkontact_basket
-X-KDE-KontactPluginVersion=5
+X-KDE-KontactPluginVersion=6
 X-KDE-KontactPartLibraryName=libbasketpart
 X-KDE-KontactPartExecutableName=basket
 X-KDE-KontactPartLoadOnStart=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/basket/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Apr 2007 17:59:54 -0000	1.6
+++ .cvsignore	21 Jun 2010 09:34:27 -0000	1.7
@@ -1 +1 @@
-basket-1.0.2.tar.gz
+basket-1.0.3.1.tar.gz


Index: basket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/basket/EL-5/basket.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- basket.spec	24 Apr 2007 17:59:54 -0000	1.13
+++ basket.spec	21 Jun 2010 09:34:27 -0000	1.14
@@ -1,44 +1,65 @@
-Name:           basket
-Summary:        Notes taker for KDE
-Version:        1.0.2
-Release:        1%{?dist}
-URL:            http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-%{version}.tar.gz
-License:        GPL
-
-Group:          Applications/Productivity
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs-devel, desktop-file-utils, gamin-devel
-BuildRequires:  gpgme-devel, kdepim-devel
-Requires:       kdebase >= 3.0, hicolor-icon-theme
+%if 0%{?fedora} < 10
+%define with_kontact 1
+%endif
+
+Name:          basket
+Version:       1.0.3.1
+Release:       7%{?dist}
+Summary:       Taking care of your ideas
+
+Group:         Applications/Productivity
+License:       GPLv2+
+URL:           http://basket.kde.org/
+Source0:       http://basket.kde.org/downloads/%{name}-%{version}.tar.gz
+# Make it appear in Kontact from enterprise branch
+Patch0:        basket-1.0.2-kdepimenterprise.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel} && 0%{?rhel} < 6
+BuildRequires: kdelibs-devel
+BuildRequires: kdepim-devel
+%else
+BuildRequires: kdelibs3-devel
+BuildRequires: kdepim3-devel
+%endif
+BuildRequires: gpgme-devel gettext desktop-file-utils
+%if 0%{?with_kontact}
+%endif 
 
 %description
-This application is mainly an all-purpose notes taker. It provides baskets
-where any item can be dragged and dropped: text, formatted text, links,
-images, sounds, files, colors, application launcher...
-BasKet lets you keep all objects in one place, and keep data at hand.
+A multi-purpose note-taking application that makes it easy to write down ideas
+as you think, and quickly find them later.  You can collect, import or share
+any data, tag your notes and secure it some or all of it with passwords and/or
+encryption.
 
+%if 0%{?with_kontact}
 %package kontact
 Group:          Applications/Productivity
 Summary:        Basket plugin for Kontact
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdepim
+%if 0%{?rhel} && 0%{?rhel} < 6
+BuildRequires: kdepim
+%else
+BuildRequires: kdepim3
+%endif
 
 %description kontact
 This package contains the kontact plugin for BasKet.
-
+%endif
 
 %prep
 %setup -q
-
+iconv -f ISO_8859-1 -t UTF-8 AUTHORS > AUTHORS.tmp
+touch -r AUTHORS AUTHORS.tmp
+mv AUTHORS.tmp AUTHORS
+%patch0 -p0 -b .kdepimenterprise
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-
 %configure --disable-rpath --disable-debug
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -54,9 +75,12 @@ desktop-file-install  --vendor fedora \
         --add-category Utility \
         --add-category Qt \
         --add-category KDE \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+# Removing a random sym link created during the build process
+# This will be needed again when/if basket ever provides HTML docs -- Rex
+rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/basket/common
 
 %{find_lang} %{name}
 # HTML
@@ -66,26 +90,9 @@ for lang_dir in $RPM_BUILD_ROOT%{_docdir
   echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
 done
 
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database &> /dev/null ||:
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database &> /dev/null ||:
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING ChangeLog NEWS TODO
@@ -103,13 +110,76 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/config/magic/basket.magic
 %{_datadir}/mimelnk/application/*.desktop
 
+%if 0%{?with_kontact}
 %files kontact
+%defattr(-,root,root,-)
 %{_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
 %{_datadir}/services/kontact/*.desktop
 %{_libdir}/kde3/libkontact_basket.*
+%endif
 
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+update-desktop-database &> /dev/null || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+update-desktop-database &> /dev/null || :
 
 %changelog
+* Fri Jun 18 2010 wolfy at nobugconsulting.ro - 1.0.3.1-7
+- adjust spec from F-12 so as to build in EPEL-5
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.3.1-4
+- fix ->F-10+ upgrade path
+- Cannot configure basket, kcm_basket.la missing (#474425)
+- drop needless Requires: hicolor-icon-theme
+
+* Sat Nov 15 2008 Christopher D. Stover <quantumburnz at hotmail.com> 1.0.3.1-3
+- resolved kontact broken dependency
+
+* Mon Nov 10 2008 Christopher D. Stover <quantumburnz at hotmail.com> 1.0.3.1-2
+- added a requires for hicolor-icon-theme
+- removed -p from the main package /sbin/ldconfig
+
+* Sat Oct 25 2008 Christopher D. Stover <quantumburnz at hotmail.com> 1.0.3.1-1
+- version 1.0.3.1
+- gcc43 patch is no longer needed
+
+* Sat Jun 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.2-7
+- disable -kontact for F10+ (can't integrate KDE 3 app into KDE 4 Kontact)
+
+* Sun Jun 01 2008 Aurelien Bompard <abompard at fedoraproject.org> 1.0.2-6
+- rebuild
+
+* Wed Mar 02 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.2-5
+- fix rawhide build (#433960)
+- summary: s/for KDE//
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> 1.0.2-4
+- Autorebuild for GCC 4.3
+
+* Sat Oct 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.0.2-3
+- fix kontact plugin for kdepim-enterprise (bug 354771)
+
+* Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.0.2-2
+- rebuild for BuildID
+- fix license tag
+
 * Tue Apr 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.0.2-1
 - version 1.0.2 (bug 237660)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/basket/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Apr 2007 17:59:54 -0000	1.6
+++ sources	21 Jun 2010 09:34:27 -0000	1.7
@@ -1 +1 @@
-d71c62a56de9cc32ba2633e63e99071f  basket-1.0.2.tar.gz
+5a58bbe69c4a80a40747ed80ebb5b3b9  basket-1.0.3.1.tar.gz

