rpms/kickpim/devel kickpim.spec,1.8,1.9
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Aug 8 15:32:11 UTC 2005
- Previous message (by thread): rpms/snownews/FC-3 snownews-1.5.7-manpath.patch, NONE, 1.1 snownews-1.5.7-softlink.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 snownews.spec, 1.3, 1.4 sources, 1.3, 1.4 snownews-1.5.6.1-destdir.patch, 1.1, NONE snownews-1.5.6.1-manpath.patch, 1.1, NONE
- Next message (by thread): rpms/gc/devel gc6.5-opendl.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gc.spec, 1.8, 1.9 sources, 1.4, 1.5 gc6.4-opendl.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/extras/rpms/kickpim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4037
Modified Files:
kickpim.spec
Log Message:
cleanup BR's
use %%find_lang
use --enable-final
Index: kickpim.spec
===================================================================
RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kickpim.spec 23 May 2005 00:25:25 -0000 1.8
+++ kickpim.spec 8 Aug 2005 15:32:09 -0000 1.9
@@ -3,37 +3,31 @@
Name: kickpim
Summary: KDE kicker applet to access addressbook
Version: 0.5.3
-Release: 7%{?dist_tag}
+Release: 7%{?dist}
License: GPL
Group: Applications/Productivity
URL: http://kickpim.sourceforge.net/
Source: http://dl.sourceforge.net/sourceforge/kickpim/kickpim-0.5.3.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# remove build dep on qt-3.2
Patch1: kickpim-0.5.3-qtdesigner.patch
BuildRequires: autoconf >= 2.53
-# to workaround missing Requires in redhat's qt-devel, kdelibs-devel
-# and to make fedora's buildsystem happy
-BuildRequires: XFree86-devel
-BuildRequires: libpng-devel zlib-devel libjpeg-devel
-BuildRequires: arts-devel libart_lgpl-devel
-
-BuildRequires: kdepim-devel >= 6:3.1
-Requires: kdebase
-
-# Dynamically determine qt,kdelibs dependancies, depending on
-# what we're built against.
-BuildRequires: qt-devel >= 1:3.1
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2)
+# Dynamically determine qt/kde dependancies,
+# depending on what we're built against.
+BuildRequires: qt-devel >= 1:3.3
+%define qt_ver %(rpm -q --qf '%%{version}' qt-devel )
Requires: qt >= 1:%{qt_ver}
-
-BuildRequires: kdelibs-devel >= 6:3.1
+BuildRequires: kdelibs-devel >= 6:3.3
%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel )
Requires: kdelibs >= 6:%{kdelibs_ver}
+BuildRequires: kdepim-devel >= 6:3.3
+#define kdepim_ver %(rpm -q --qf '%%{version}' kdepim-devel )
+#Requires: kdepim >= 6:%{kdepim_ver}
+Requires: kdebase
%description
KickPIM is a panel applet for quickly editing and accessing the KDE
@@ -57,7 +51,7 @@
%configure \
--disable-rpath \
%{?debug: --enable-debug --enable-warnings } \
- %{!?debug: --disable-debug --disable-warnings }
+ %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
make %{?_smp_mflags}
@@ -67,7 +61,17 @@
make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# HTML
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+ lang=$(basename $lang_dir)
+ echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
+done
+fi
%files -f %{name}.lang
@@ -76,13 +80,13 @@
%{_libdir}/lib*
%{_datadir}/apps/kicker/applets/*.desktop
%{_datadir}/apps/kickpim
-%lang(en) %doc %{_docdir}/HTML/en/*
%clean
rm -rf $RPM_BUILD_ROOT
+
%changelog
* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.5.3
- rebuild on all arches
- Previous message (by thread): rpms/snownews/FC-3 snownews-1.5.7-manpath.patch, NONE, 1.1 snownews-1.5.7-softlink.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 snownews.spec, 1.3, 1.4 sources, 1.3, 1.4 snownews-1.5.6.1-destdir.patch, 1.1, NONE snownews-1.5.6.1-manpath.patch, 1.1, NONE
- Next message (by thread): rpms/gc/devel gc6.5-opendl.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gc.spec, 1.8, 1.9 sources, 1.4, 1.5 gc6.4-opendl.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list