rpms/kdepim/FC-4 kdepim-3.4.92-libz.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 kdepim.spec, 1.55, 1.56 sources, 1.28, 1.29 admin-visibility.patch, 1.3, NONE kdepim-3.4.0-gcc4.patch, 1.1, NONE kdepim-3.4.0-kandy-lockdev.patch, 1.1, NONE kdepim-kpilot-fix.diff, 1.1, NONE korganizerrc, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Feb 1 14:53:41 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdepim/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1117
Modified Files:
.cvsignore kdepim.spec sources
Added Files:
kdepim-3.4.92-libz.patch
Removed Files:
admin-visibility.patch kdepim-3.4.0-gcc4.patch
kdepim-3.4.0-kandy-lockdev.patch kdepim-kpilot-fix.diff
korganizerrc
Log Message:
3.5.1
kdepim-3.4.92-libz.patch:
Makefile.am | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE kdepim-3.4.92-libz.patch ---
--- kdepim-3.4.92/indexlib/Makefile.am.orig 2005-10-26 11:19:59.000000000 +0200
+++ kdepim-3.4.92/indexlib/Makefile.am 2005-10-26 11:17:33.000000000 +0200
@@ -5,6 +5,8 @@
libindex_la_SOURCES = bitstream.cpp compressed.cpp create.cpp exception.cpp ifile.cpp leafdata.cpp leafdatavector.cpp lockfile.cpp logfile.cpp match.cpp mmap_manager.cpp quotes.cpp slow.cpp stringarray.cpp stringset.cpp tokenizer.cpp
+libindex_la_LIBADD = $(LIBZ)
+
indexlibincludedir=$(includedir)/index
indexlibinclude_HEADERS = create.h index.h lockfile.h
bin_SCRIPTS = indexlib-config
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 14 Jun 2005 12:14:34 -0000 1.25
+++ .cvsignore 1 Feb 2006 14:53:39 -0000 1.26
@@ -4,3 +4,4 @@
kdepim-3.4.0-rc1.tar.bz2
kdepim-3.4.0.tar.bz2
kdepim-3.4.1.tar.bz2
+kdepim-3.5.1.tar.bz2
Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/kdepim.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdepim.spec 17 Jun 2005 08:52:31 -0000 1.55
+++ kdepim.spec 1 Feb 2006 14:53:39 -0000 1.56
@@ -2,13 +2,14 @@
%define final 0
%define qt_version 1:3.3.4
-%define arts_version 8:1.4.1
+%define arts_version 8:1.5.1
%define arts 1
%define make_cvs 1
+%define disable_gcc_check_and_hidden_visibility 1
-Version: 3.4.1
-Release: 0.fc4.2
+Version: 3.5.1
+Release: 0.1.fc4
Name: kdepim
Summary: PIM (Personal Information Manager) for KDE
Prefix: /usr
@@ -17,24 +18,19 @@
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
URL: http://www.kde.org
-
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: korganizerrc
Source2: cr48-app-kandy.png
Source3: cr32-app-kandy.png
Source4: cr16-app-kandy.png
Patch1: kde-libtool.patch
Patch3: kdepim-3.4.0-s390.patch
-Patch5: kdepim-3.4.0-gcc4.patch
-Patch6: kdepim-3.4.0-kandy-lockdev.patch
Patch7: kdepim-3.4.0-kandy-icons.patch
-Patch8: kdepim-kpilot-fix.diff
-# gcc4 workaround
-Patch100: admin-visibility.patch
+Patch8: kdepim-3.4.92-libz.patch
Requires: kdebase >= 6:%{version}
+BuildRequires: perl
BuildRequires: bison
BuildRequires: flex
BuildRequires: desktop-file-utils
@@ -42,6 +38,7 @@
BuildRequires: qt-devel >= %{qt_version}
BuildRequires: zlib-devel
BuildRequires: libart_lgpl-devel
+BuildRequires: audiofile-devel
%if %{arts}
BuildRequires: arts-devel >= %{arts_version}
%endif
@@ -102,18 +99,14 @@
%prep
%setup -q
%patch1 -p1 -b .libtool
+
%ifarch s390 s390x
%patch3 -p1 -b .s390
rm -rf kpilot
-%else
-pushd kpilot
-%patch8 -p0 -b .kpilot
-popd
%endif
-%patch5 -p1 -b .gcc4
-%patch6 -p1 -b .lockdev
+
%patch7 -p1 -b .kandy-icons
-%patch100 -p1 -b .gcc4_workaround
+%patch8 -p1 -b .libz
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -129,10 +122,19 @@
%endif
%configure \
+ --enable-new-ldflags \
+ --disable-dependency-tracking \
--disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+ --disable-gcc-hidden-visibility \
+%endif
%if %{arts} == 0
--without-arts \
%endif
+%if %{debug} == 0
+ --disable-debug \
+ --disable-warnings \
+%endif
%if %{final}
--enable-final \
%endif
@@ -170,8 +172,6 @@
${RPM_BUILD_ROOT}%{_datadir}/applications/kde/Kontact.desktop \
${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KOrn.desktop
-cp %{SOURCE1} $RPM_BUILD_ROOT%{prefix}/share/config/
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -189,7 +189,6 @@
%{_datadir}/applications/kde/*
%{_datadir}/applnk/.hidden/*
%{_datadir}/applnk/Applications
-%{_datadir}/applnk/Internet
%{_datadir}/applnk/Utilities
%{_datadir}/apps/*
%{_datadir}/autostart/*
@@ -206,10 +205,26 @@
%{_includedir}/kde/*
%changelog
-* Fri Jun 17 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.2
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
+- 3.5.1
+
+* Mon Dec 12 2005 Than Ngo <than at redhat.com> 6:3.5.0-0.2.fc4
+- apply patch to fix crash when applying pipe through filters
+
+* Mon Aug 15 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.4
+- apply patch to fix kpilot crash
+
+* Tue Aug 02 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.3
+- apply patch to fix kmail bug, kde#109003
+
+* Wed Jul 27 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.2
+- update to 3.4.2
+- drop some patches which are included in upstream
+
+* Fri Jun 17 2005 Than Ngo <than at redhat.com> 6:3.4.1-0.fc4.2
- add kdepim-kpilot-fix.diff
-* Tue Jun 14 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
+* Tue Jun 14 2005 Than Ngo <than at redhat.com> 6:3.4.1-0.fc4.1
- update to 3.4.1
- remove kdepim-3.4.0-long.patch, it's included in new upstream
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 14 Jun 2005 12:14:34 -0000 1.28
+++ sources 1 Feb 2006 14:53:39 -0000 1.29
@@ -1 +1 @@
-e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2
+8e87c9cbe1f0c0f983f94d804a5bc8f9 kdepim-3.5.1.tar.bz2
--- admin-visibility.patch DELETED ---
--- kdepim-3.4.0-gcc4.patch DELETED ---
--- kdepim-3.4.0-kandy-lockdev.patch DELETED ---
--- kdepim-kpilot-fix.diff DELETED ---
--- korganizerrc DELETED ---
More information about the fedora-cvs-commits
mailing list