rpms/kdepim/F-7 kdepim-enterprise-svn_checkout.sh, NONE, 1.1 kdepim-xdg_open.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 kdepim.spec, 1.128, 1.129 sources, 1.41, 1.42 cr16-app-kandy.png, 1.1, NONE cr32-app-kandy.png, 1.1, NONE cr48-app-kandy.png, 1.1, NONE kdepim-3.4.0-s390.patch, 1.1, NONE kdepim-3.4.92-libz.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Oct 8 13:35:19 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdepim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18956
Modified Files:
.cvsignore kdepim.spec sources
Added Files:
kdepim-enterprise-svn_checkout.sh kdepim-xdg_open.patch
Removed Files:
cr16-app-kandy.png cr32-app-kandy.png cr48-app-kandy.png
kdepim-3.4.0-s390.patch kdepim-3.4.92-libz.patch
Log Message:
sync w/devel branch (kdepim-enterprise branch goodness)
--- NEW FILE kdepim-enterprise-svn_checkout.sh ---
#/bin/sh
DATE=$(date +%Y%m%d)
EXPORT_DIR=kdepim
set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/branches/kdepim/enterprise/kdepim $EXPORT_DIR/
# auto*/configure bits
# svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin $EXPORT_DIR/admin/
tar cjf kdepim-enterprise-svn${DATE}.tar.bz2 $EXPORT_DIR
# cleanup
rm -rf $EXPORT_DIR
kdepim-xdg_open.patch:
--- NEW FILE kdepim-xdg_open.patch ---
diff -up kdepim/akregator/src/akregator.kcfg~ kdepim/akregator/src/akregator.kcfg
--- kdepim/akregator/src/akregator.kcfg~ 2006-11-30 11:13:45.000000000 +0200
+++ kdepim/akregator/src/akregator.kcfg 2007-10-02 21:54:41.000000000 +0300
@@ -154,7 +154,7 @@
</entry>
<entry key="External Browser Custom Command" type="String" >
<whatsthis>Command to launch external browser. URL will substitute for %u.</whatsthis>
- <default>firefox %u</default>
+ <default>xdg-open %u</default>
</entry>
<entry key="LMB Behaviour" type="Enum" >
<whatsthis>What the click with left mouse button should do.</whatsthis>
diff -up kdepim/akregator/src/settings_browser.ui~ kdepim/akregator/src/settings_browser.ui
--- kdepim/akregator/src/settings_browser.ui~ 2005-11-19 12:38:13.000000000 +0200
+++ kdepim/akregator/src/settings_browser.ui 2007-10-02 21:54:32.000000000 +0300
@@ -64,7 +64,7 @@
<bool>false</bool>
</property>
<property name="text">
- <string>firefox %u</string>
+ <string>xdg-open %u</string>
</property>
</widget>
</grid>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 6 Jun 2007 19:19:48 -0000 1.35
+++ .cvsignore 8 Oct 2007 13:34:46 -0000 1.36
@@ -1,16 +1,5 @@
-kdepim-3.3.0.tar.bz2
-kdepim-3.3.1.tar.bz2
-kdepim-3.3.2.tar.bz2
-kdepim-3.4.0-rc1.tar.bz2
-kdepim-3.4.0.tar.bz2
-kdepim-3.4.1.tar.bz2
-kdepim-3.4.2.tar.bz2
-kdepim-3.4.91.tar.bz2
-kdepim-3.4.92.tar.bz2
-kdepim-3.5.0.tar.bz2
-kdepim-3.5.1.tar.bz2
-kdepim-3.5.2.tar.bz2
-kdepim-3.5.3.tar.bz2
-kdepim-3.5.4.tar.bz2
-timezone-update.diff.bz2
kdepim-3.5.7.tar.bz2
+cr16-app-kandy.png
+cr32-app-kandy.png
+cr48-app-kandy.png
+kdepim-enterprise-svn20070926.tar.bz2
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/kdepim.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- kdepim.spec 19 Jun 2007 23:39:51 -0000 1.128
+++ kdepim.spec 8 Oct 2007 13:34:46 -0000 1.129
@@ -1,43 +1,54 @@
-%define debug 0
-%define final 0
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
+
+# enterprise branch
+%define ent_date 20070926
+%define ent_rev 714749
+
+#define debug 1
+## --enable-final requires > 1GB VM, sometimes kills fedora's builders
+#define final 1
+
%define make_cvs 1
%define _with_gnokii --with-gnokii
%define _with_mal --with-mal
Name: kdepim
-Summary: PIM (Personal Information Manager) for KDE
+Summary: PIM (Personal Information Manager) applications
Epoch: 6
Version: 3.5.7
-Release: 3%{?dist}
+License: GPLv2
Group: Applications/Productivity
-License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.kde.org
+%if 0%{?ent_date} > 0
+Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
+Release: 10.svn%{ent_date}.ent%{?dist}
+%else
+Release: 8%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+%endif
Source1: cr48-app-kandy.png
Source2: cr32-app-kandy.png
Source3: cr16-app-kandy.png
-Patch2: kdepim-3.4.0-s390.patch
-Patch3: kdepim-3.4.0-kandy-icons.patch
-Patch4: kdepim-3.4.92-libz.patch
+Patch1: kdepim-3.4.0-kandy-icons.patch
+Patch2: kdepim-xdg_open.patch
+
+Provides: kdepim3 = %{version}-%{release}
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdelibs3 >= %{version}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: bison flex
BuildRequires: desktop-file-utils
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
-# kmix (?) -- Rex
-BuildRequires: kdemultimedia
-# kttsd
+BuildRequires: kdelibs3-devel >= %{version}
+## kmix (?)
+BuildRequires: kdemultimedia3
+## kttsd
BuildRequires: kdeaccessibility
BuildRequires: zlib-devel
BuildRequires: libart_lgpl-devel
@@ -45,7 +56,7 @@
BuildRequires: lockdev-devel
BuildRequires: python-devel
%ifnarch s390 s390x
-%if 0%{?fedora} > 6
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
%define _with_pilot_link --with-pilot-link
BuildRequires: pilot-link-devel >= 0.12
# AvantGo support via libmal
@@ -65,7 +76,9 @@
BuildRequires: automake libtool
%endif
-Obsoletes: akregator < 0:1.0
+%define akregator_ver 1.2.7
+Obsoletes: akregator < 0:%{akregator_ver}-%{release}
+#Provides: akregator = 0:%{akregator_ver}-%{release}
##Optional bits
Requires(hint): pinentry-gui
@@ -79,48 +92,48 @@
%endif
%description
-A PIM (Personal Information Manager) for KDE.
+%{summary}, including:
+* akregator: feed aggregator
+* kmail: email client
+* knode: newsreader
+* knotes: sticky notes for the desktop
+* kontact: integrated PIM management
+* korganizer: journal, appointments, events, todos
+%{?_with_pilot_link:* kpilot: HotSync® software for Palm OS® devices}
%package devel
-Summary: Development files for kdepim
+Summary: Development files for %{name}
Group: Development/Libraries
+Provides: kdepim3-devel = %{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+Requires: kdelibs3-devel
%description devel
-Development files for %{name}.
+%{summary}.
Install %{name}-devel if you want to write or compile %{name} plugins.
%prep
-%setup -q
+%setup -q %{?ent_date: -n %{name}}
-%ifarch s390 s390x
-%patch2 -p1 -b .s390
-rm -rf kpilot
-%endif
-
-%patch3 -p1 -b .kandy-icons
-%patch4 -p1 -b .libz
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
+%patch1 -p1 -b .kandy-icons
-cp -f %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src
+%patch2 -p1 -b .xdg_open
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
-%if %{debug} == 0
- --disable-debug \
- --disable-warnings \
-%endif
-%if %{final}
- --enable-final \
-%endif
+ %{!?debug:--disable-debug --disable-warnings} \
+ %{?final: --enable-final} \
--includedir=%{_includedir}/kde \
--with-gpg=%{_bindir}/gpg \
--with-gpgsm=%{_bindir}/gpgsm \
@@ -132,27 +145,22 @@
make %{?_smp_mflags}
+
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
-# Make symlinks relative
-mkdir -p %{buildroot}%{prefix}/share/doc/HTML/en/common
-pushd %{buildroot}%{prefix}/share/doc/HTML/en
+# make symlinks relative
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
for i in *; do
- [ -d $i -a -L $i/common ] && (cd $i && ln -nfs ../common . && cd ..)
-done
-popd
-
-## FIXME. *ALL* of these? Surely, non-kde users should get to see
-## some of these gems. -- Rex
-for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
- KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
- if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
- echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
+ if [ -d $i -a -L $i/common ]; then
+ rm -f $i/common
+ ln -nfs ../common $i
fi
done
+popd
## remove references to extraneous/optional libraries in .la files (#170602)
find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
@@ -163,6 +171,7 @@
-e "s at -lgpgme@@g" \
-e "s at -lgpg-error@@g"
+
%post
/sbin/ldconfig ||:
for i in crystalsvg hicolor locolor ; do
@@ -179,43 +188,70 @@
done
%{_bindir}/update-desktop-database >& /dev/null ||:
+
%clean
rm -rf %{buildroot}
+
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc README korganizer/COPYING
%{_bindir}/*
%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
%{_libdir}/libakregatorprivate.so
%{_libdir}/libkmailprivate.so
%{_libdir}/libknodecommon.so
-%{_libdir}/lib*.la
%{_libdir}/kde3/*
%{_libdir}/kconf_update_bin/*
%{_datadir}/applications/kde/*
%{_datadir}/applnk/.hidden/*
-%{_datadir}/applnk/Applications
-%{_datadir}/applnk/Utilities
+%{_datadir}/applnk/Applications/*
+%{_datadir}/applnk/Utilities/*
%{_datadir}/apps/*
%{_datadir}/autostart/*
-%config(noreplace) %{_datadir}/config/*
+%{_datadir}/config/*
%{_datadir}/config.kcfg/*
-%doc %{_docdir}/HTML/en/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
%{_datadir}/mimelnk/application/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
+%{_docdir}/HTML/en/*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/kde/*
%{_libdir}/lib*.so
%exclude %{_libdir}/libakregatorprivate.so
%exclude %{_libdir}/libkmailprivate.so
%exclude %{_libdir}/libknodecommon.so
+
%changelog
+* Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-10.20070926.ent
+- xdg-open patch
+
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9.20070926.ent
+- kdepim-enterprise branch 20070926 snapshot (r717374)
+
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
+- kdepim-enterprise branch 20070920 snapshot (r714749)
+
+* Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
+- drop OnlyShowIn=KDE munging
+- update %%description
+- tidy up
+
+* Mon Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
+- templates for forwarding do not work with inline mails (kde#140549)
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-6
+- License: GPLv2
+- Provides: kdepim3(-devel)
+- (Build)Requires: kdelibs3(-devel)
+
* Tue Jun 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
- +Requires(hint): spambayes (#238650)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 6 Jun 2007 19:19:48 -0000 1.41
+++ sources 8 Oct 2007 13:34:46 -0000 1.42
@@ -1 +1,4 @@
-8571db6dcf4168614c96bb72c493f931 kdepim-3.5.7.tar.bz2
+024ab01d199f9e93c43df1ef0a03510c cr16-app-kandy.png
+496c7bfc6247df2cf03aec342094ffd6 cr32-app-kandy.png
+fef385691270bad1e58e6eb5ed0ad6d6 cr48-app-kandy.png
+0d1f3d94721fbc40367aacbac91d6d34 kdepim-enterprise-svn20070926.tar.bz2
--- kdepim-3.4.0-s390.patch DELETED ---
--- kdepim-3.4.92-libz.patch DELETED ---
More information about the fedora-extras-commits
mailing list