rpms/basket/F-10 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 basket.spec, 1.24, 1.25 sources, 1.6, 1.7 basket-0.5.0-64bits.patch, 1.1, NONE basket-1.0.2-gcc43.patch, 1.1, NONE
Christopher D. Stover
quantumburnz at fedoraproject.org
Wed Nov 12 21:02:10 UTC 2008
- Previous message (by thread): rpms/glibc/devel import.log, NONE, 1.1 .cvsignore, 1.256, 1.257 glibc-fedora.patch, 1.286, 1.287 glibc.spec, 1.371, 1.372 sources, 1.281, 1.282
- Next message (by thread): rpms/basket/F-9 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 basket.spec, 1.17, 1.18 sources, 1.6, 1.7 basket-0.5.0-64bits.patch, 1.1, NONE basket-1.0.2-gcc43.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: quantumburnz
Update of /cvs/pkgs/rpms/basket/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27309/F-10
Modified Files:
.cvsignore basket.spec sources
Added Files:
import.log
Removed Files:
basket-0.5.0-64bits.patch basket-1.0.2-gcc43.patch
Log Message:
* 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
--- NEW FILE import.log ---
basket-1_0_3_1-2_fc10:F-10:basket-1.0.3.1-2.fc10.src.rpm:1226523530
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/basket/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 24 Apr 2007 17:59:58 -0000 1.6
+++ .cvsignore 12 Nov 2008 21:01:38 -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/F-10/basket.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- basket.spec 7 Jun 2008 11:01:25 -0000 1.24
+++ basket.spec 12 Nov 2008 21:01:39 -0000 1.25
@@ -2,57 +2,57 @@
%define with_kontact 1
%endif
-Name: basket
-Summary: Notes taker
-Version: 1.0.2
-Release: 7%{?dist}
-URL: http://basket.kde.org/
-Source0: http://basket.kde.org/downloads/basket-%{version}.tar.gz
-License: GPLv2+
+Name: basket
+Version: 1.0.3.1
+Release: 2%{?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
-Patch1: basket-1.0.2-gcc43.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: kdelibs3-devel, desktop-file-utils, gamin-devel
-BuildRequires: gpgme-devel
+BuildRequires: kdelibs3-devel gpgme-devel gettext desktop-file-utils
%if 0%{?with_kontact}
-BuildRequires: kdepim-devel
-%endif
+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
Requires: %{name} = %{version}-%{release}
-Requires: kdepim3
+Requires: kdepim3 kontact
%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
-%patch1 -p1 -b .gcc43
-
%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
@@ -68,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}/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
@@ -80,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
@@ -119,24 +105,48 @@
%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
+* 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
+* 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
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/basket/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 24 Apr 2007 17:59:58 -0000 1.6
+++ sources 12 Nov 2008 21:01:39 -0000 1.7
@@ -1 +1 @@
-d71c62a56de9cc32ba2633e63e99071f basket-1.0.2.tar.gz
+5a58bbe69c4a80a40747ed80ebb5b3b9 basket-1.0.3.1.tar.gz
--- basket-0.5.0-64bits.patch DELETED ---
--- basket-1.0.2-gcc43.patch DELETED ---
- Previous message (by thread): rpms/glibc/devel import.log, NONE, 1.1 .cvsignore, 1.256, 1.257 glibc-fedora.patch, 1.286, 1.287 glibc.spec, 1.371, 1.372 sources, 1.281, 1.282
- Next message (by thread): rpms/basket/F-9 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 basket.spec, 1.17, 1.18 sources, 1.6, 1.7 basket-0.5.0-64bits.patch, 1.1, NONE basket-1.0.2-gcc43.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list