rpms/basket/F-8 basket.spec,1.15,1.16

[Christopher D. Stover]

Author: quantumburnz

Update of /cvs/pkgs/rpms/basket/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17615

Modified Files:
	basket.spec 
Log Message:
* 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



Index: basket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/basket/F-8/basket.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- basket.spec	27 Oct 2007 09:46:00 -0000	1.15
+++ basket.spec	16 Nov 2008 14:41:22 -0000	1.16
@@ -1,25 +1,34 @@
-Name:           basket
-Summary:        Notes taker for KDE
-Version:        1.0.2
-Release:        3%{?dist}
-URL:            http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-%{version}.tar.gz
-License:        GPLv2+
+%if 0%{?fedora} < 10
+%define with_kontact 1
+%endif
+
+Name:          basket
+Version:       1.0.3.1
+Release:       3%{?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
+Patch0:        basket-1.0.2-kdepimenterprise.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-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
+BuildRequires: kdelibs3-devel gpgme-devel gettext desktop-file-utils
+%if 0%{?with_kontact}
+BuildRequires: kdepim-devel
+%endif 
+
+Requires:      hicolor-icon-theme
 
 %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
@@ -28,20 +37,22 @@
 
 %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
@@ -57,9 +68,12 @@
         --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
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+# Removing a random sym link created during the build process
+rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/basket/common
 
 %{find_lang} %{name}
 # HTML
@@ -69,26 +83,9 @@
   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
@@ -106,13 +103,55 @@
 %{_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
+* 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)