rpms/kdepim/devel .cvsignore, 1.35, 1.35.6.1 kdepim.spec, 1.131, 1.131.4.1 sources, 1.40, 1.40.6.1 cr16-app-kandy.png, 1.1, NONE cr32-app-kandy.png, 1.1, NONE cr48-app-kandy.png, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Sep 20 18:10:33 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15120
Modified Files:
Tag: kdepim-enterprise-branch
.cvsignore kdepim.spec sources
Removed Files:
Tag: kdepim-enterprise-branch
cr16-app-kandy.png cr32-app-kandy.png cr48-app-kandy.png
Log Message:
initial import, still (probably) needswork to actually build
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.35.6.1
diff -u -r1.35 -r1.35.6.1
--- .cvsignore 16 Jun 2007 19:14:32 -0000 1.35
+++ .cvsignore 20 Sep 2007 18:10:00 -0000 1.35.6.1
@@ -1,16 +1,4 @@
-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-svn_r714749.tar.bz2
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131
retrieving revision 1.131.4.1
diff -u -r1.131 -r1.131.4.1
--- kdepim.spec 12 Sep 2007 15:47:56 -0000 1.131
+++ kdepim.spec 20 Sep 2007 18:10:00 -0000 1.131.4.1
@@ -1,25 +1,36 @@
-%define debug 0
-# --enable-final requires > 1GB VM, sometimes kills our builders
-%define final 0
+
+# enterprise branch
+%define ent_date 20070920
+%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) applications
Epoch: 6
Version: 3.5.7
-Release: 8%{?dist}
License: GPLv2
Group: Applications/Productivity
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.kde.org
+%if 0%{?ent_date} > 0
+Source0: kdepim-enterprise-svn_r%{ent_rev}.tar.bz2
+Release: 8.%{ent_date}.%{ent_rev}.ent
+%else
+Release: 8
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
@@ -106,39 +117,34 @@
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
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
%patch3 -p1 -b .kandy-icons
%patch4 -p1 -b .libz
%patch140549 -p1 -b .kde#140549
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
-
%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 \
@@ -167,18 +173,6 @@
done
popd
-
-## FIXME. *ALL* of these? Surely, non-kde users should get to see
-## some of these gems. -- Rex
-%if 0
-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
- fi
-done
-%endif
-
## remove references to extraneous/optional libraries in .la files (#170602)
find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
sed -i \
@@ -247,6 +241,9 @@
%changelog
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
+- kdepim-enterprise branch r714749, 20070920 snapshot
+
* Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
- drop OnlyShowIn=KDE munging
- update %%description
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.40
retrieving revision 1.40.6.1
diff -u -r1.40 -r1.40.6.1
--- sources 16 Jun 2007 19:14:32 -0000 1.40
+++ sources 20 Sep 2007 18:10:00 -0000 1.40.6.1
@@ -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
+23d93b3a795d7dd84331549fa3e95c29 kdepim-enterprise-svn_r714749.tar.bz2
More information about the fedora-extras-commits
mailing list