rpms/basket/devel .cvsignore, 1.8, 1.9 basket.spec, 1.31, 1.32 import.log, 1.1, 1.2 sources, 1.8, 1.9
Manuel Wolfshant
wolfy at fedoraproject.org
Tue Jun 22 15:16:25 UTC 2010
Author: wolfy
Update of /cvs/pkgs/rpms/basket/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30835/devel
Modified Files:
.cvsignore basket.spec import.log sources
Log Message:
initial version for EPEL-6, requires KDE3 libs
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/basket/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 11 Apr 2010 11:14:13 -0000 1.8
+++ .cvsignore 22 Jun 2010 15:16:25 -0000 1.9
@@ -1 +1 @@
-basket-1.80.tar.bz2
+basket-1.0.3.1.tar.gz
Index: basket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/basket/devel/basket.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- basket.spec 7 Jun 2010 05:50:09 -0000 1.31
+++ basket.spec 22 Jun 2010 15:16:25 -0000 1.32
@@ -1,20 +1,35 @@
+%if 0%{?fedora} && 0%{?fedora} < 10
+%define with_kontact 1
+%endif
+%if 0%{?rhel} && 0%{?rhel} < 6
+%define with_kontact 1
+%endif
+
Name: basket
-Version: 1.80
-Release: 2%{?dist}
+Version: 1.0.3.1
+Release: 8%{?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.bz2
+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)
-
-BuildRequires: kdelibs4-devel qimageblitz-devel kdepimlibs-devel
+%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
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+#ppc build fails due to kdepim not existing in RHEL / ppc arch
+%if 0%{?rhel}
+ExcludeArch: ppc ppc64
+%endif
%description
A multi-purpose note-taking application that makes it easy to write down ideas
@@ -22,94 +37,116 @@ as you think, and quickly find them late
any data, tag your notes and secure it some or all of it with passwords and/or
encryption.
-%package libs
-Summary: Basket libraries
-Group: Development/Libraries
+%if 0%{?with_kontact}
+%package kontact
+Group: Applications/Productivity
+Summary: Basket plugin for Kontact
Requires: %{name} = %{version}-%{release}
-%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
-
-%description libs
-Basket libraries
+%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
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} .. -DBUILD_KPARTS=1
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
+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 %{buildroot}
-make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
# Icons: use hicolor instead of crystalsvg
-# mv %{buildroot}%{_datadir}/icons/{crystalsvg,hicolor}
+mv $RPM_BUILD_ROOT%{_datadir}/icons/{crystalsvg,hicolor}
# Menu
-desktop-file-install --vendor='' \
- --dir %{buildroot}%{_datadir}/applications/kde4 \
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor fedora \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
--delete-original \
--add-category Utility \
--add-category Qt \
--add-category KDE \
- %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-%find_lang %{name} --with-kde
+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
+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
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-%post libs -p /sbin/ldconfig
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc README AUTHORS COPYING ChangeLog NEWS TODO
+%{_bindir}/basket
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/actions/*.png
+%{_datadir}/icons/hicolor/*/mimetypes/*.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/apps/basket
+%{_libdir}/kde3/kcm_basket.*
+%{_libdir}/kde3/libbasketpart.*
+%{_libdir}/kde3/basketthumbcreator.*
+%{_libdir}/libbasketcommon.so
+%{_datadir}/services/*.desktop
+%{_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
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/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 libs -p /sbin/ldconfig
-
%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
- update-desktop-database -q &> /dev/null
- update-mime-database %{_kde4_datadir}/mime &> /dev/null
+/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
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null
-update-mime-database %{_kde4_datadir}/mime &> /dev/null
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc README AUTHORS COPYING TODO
-%{_kde4_bindir}/basket
-%{_kde4_datadir}/applications/kde4/*.desktop
-%{_kde4_iconsdir}/hicolor/*/actions/*.png
-%{_kde4_iconsdir}/hicolor/*/apps/%{name}.*
-%{_kde4_appsdir}/basket/
-%{_kde4_datadir}/kde4/services/*.desktop
-%{_kde4_datadir}/config/magic/basket.magic
-# this is old kde3-style mime defs, should get updated
-# for xdg-style for consumption by updates-mime-database -- Rex
-%{_kde4_datadir}/mimelnk/application/*.desktop
-
-%files libs
-%defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/*.so*
+update-desktop-database &> /dev/null || :
%changelog
-* Tue May 11 2010 Rex Dieter <rdieter at fedoraproject.org> 1.80-2
-- dfi usage: drop --vendor=fedora
-- various .spec cosmetics
+* Tue Jun 22 2010 wolfy at nobugconsulting.ro - 1.0.3.1-8
+- replace %%exclusivearch{ix86} with %%excludearch{ppc}
+- fix conditionals (for EPEL-6)
-* Sun Apr 11 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.80-1
-- basket-1.80
+* 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
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/basket/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 13 Nov 2008 05:25:14 -0000 1.1
+++ import.log 22 Jun 2010 15:16:25 -0000 1.2
@@ -1 +1,2 @@
basket-1_0_3_1-2_fc10:HEAD:basket-1.0.3.1-2.fc10.src.rpm:1226532725
+basket-1_0_3_1-8_el6:HEAD:basket-1.0.3.1-8.el6.src.rpm:1277219728
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/basket/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 11 Apr 2010 11:14:13 -0000 1.8
+++ sources 22 Jun 2010 15:16:25 -0000 1.9
@@ -1 +1 @@
-77467400907e6f496ef5f90a2f1c07ab basket-1.80.tar.bz2
+5a58bbe69c4a80a40747ed80ebb5b3b9 basket-1.0.3.1.tar.gz
More information about the scm-commits
mailing list