rpms/basket/devel .cvsignore, 1.2, 1.3 basket.spec, 1.8, 1.9 sources, 1.2, 1.3

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/basket/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627/devel

Modified Files:
	.cvsignore basket.spec sources 
Log Message:
version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 16:11:00 -0000	1.2
+++ .cvsignore	25 Oct 2006 20:03:14 -0000	1.3
@@ -1 +1 @@
-basket-0.5.0.tar.gz
+basket-0.6.0.tar.gz


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/basket.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- basket.spec	4 Oct 2006 22:48:16 -0000	1.8
+++ basket.spec	25 Oct 2006 20:03:14 -0000	1.9
@@ -1,10 +1,9 @@
 Name:           basket
 Summary:        Notes taker for KDE
-Version:        0.5.0
-Release:        10%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 URL:           	http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
-Patch0:         basket-0.5.0-64bits.patch
+Source0:        http://basket.kde.org/downloads/basket-0.6.0.tar.gz
 License:        GPL
 
 Group:          Applications/Productivity
@@ -21,8 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bits
-sed -i.orig -e 's/^basket_LDADD = \(.*\)$/basket_LDADD = -lfam \1/g' src/Makefile.in
 
 
 %build
@@ -38,18 +35,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{find_lang} %{name}
-
 # Icons: use hicolor instead of crystalsvg
 mv $RPM_BUILD_ROOT%{_datadir}/icons/{crystalsvg,hicolor}
 
 # Menu
-# fix encoding
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop \
-        > $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop
-# install desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -61,6 +50,16 @@
         --add-category KDE \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%{find_lang} %{name}
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  lang=$(basename $lang_dir)
+  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+done
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -84,15 +83,21 @@
 %doc README AUTHORS COPYING ChangeLog NEWS TODO
 %{_bindir}/basket
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/actions/*.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/apps/basket
-%{_datadir}/doc/HTML/*/basket
-
+%{_libdir}/kde3/kcm_basket.*
+%{_libdir}/kde3/libbasketpart.*
+%{_libdir}/libbasketcommon.so
+%{_datadir}/services/*.desktop
 
 
 %changelog
+* Wed Oct 25 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.6.0-1
+- version 0.6.0
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
 - add explicit linking to libfam


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 16:11:00 -0000	1.2
+++ sources	25 Oct 2006 20:03:14 -0000	1.3
@@ -1 +1 @@
-1495261da3dbfc243a8340cd9c5723c2  basket-0.5.0.tar.gz
+968072a1c1dce84a0c6f8b72bd9b65b8  basket-0.6.0.tar.gz