From 038cfab3e249b7df2eb681675182ad815958d0a5 Mon Sep 17 00:00:00 2001
From: Roland Wolters <liquidat@fedoraproject.org>
Date: Jul 06 2007 13:00:00 +0000
Subject: Some spec file fixes re-added


---

diff --git a/ktorrent.spec b/ktorrent.spec
index 028899f..158c096 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -2,15 +2,21 @@
 
 Name:           ktorrent
 Version:        2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
-Source0:        http://ktorrent.org/downloads/2.2/ktorrent-2.2.tar.gz
+Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel kdelibs-devel gettext gmp-devel avahi-devel automake desktop-file-utils
+BuildRequires:  kdelibs-devel
+BuildRequires:  gettext   
+BuildRequires:  gmp-devel   
+BuildRequires:  avahi-devel   
+BuildRequires:  desktop-file-utils   
+# for 'make -f admin/Makefile.common'   
+BuildRequires:  automake
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -19,16 +25,23 @@ searching using various search engines, UDP Trackers and UPnP support.
 
 %prep
 %setup -q
+# fix "WARNING:.../Makefile.in seems to ignore the --datarootdir setting"
 make -f admin/Makefile.common
 
 %build
-%configure	--disable-rpath
+%configure \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
+
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/ktorrent.desktop
@@ -37,6 +50,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/ktorrent.desktop
         --add-category=X-Fedora                                 \
         %{buildroot}%{_datadir}/applications/kde/ktorrent.desktop
 
+# Unpackaged files
+rm -f %{buildroot}%{_libdir}/lib*.la
+
 %post
 /sbin/ldconfig 2>/dev/null
 
@@ -63,7 +79,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%exclude %{_libdir}/lib*.la
 %{_bindir}/ktcachecheck
 %{_bindir}/ktorrent
 %{_bindir}/kttorinfo
@@ -96,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/kde3/ktzeroconfplugin.so
 %{_libdir}/kde3/ktzeroconfplugin.la
 %{_datadir}/applications/kde/ktorrent.desktop
-%{_datadir}/apps/ktorrent
+%{_datadir}/apps/ktorrent/
 %{_datadir}/config.kcfg/ktlogviewerplugin.kcfg
 %{_datadir}/config.kcfg/ktrssfeedplugin.kcfg
 %{_datadir}/config.kcfg/ktscanfolderplugin.kcfg
@@ -137,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/services/ktzeroconfplugin.desktop
 
 %changelog
+* Fri Jul 06 2007 Roland Wolters <wolters.liste@gmx.net> 2.2-2
+- spec-file fixes re-included
+
 * Tue Jul 03 2007 Roland Wolters <wolters.liste@gmx.net> 2.2-1
 - update to upstream 2.2:
 	- cleaner UI
@@ -151,6 +169,10 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jun 13 2007 Roland Wolters <wolters.liste@gmx.net> 2.2rc1-1
 - update to upstream 2.2rc1
 
+* Tue Apr 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.1.3-1
+- ktorrent-2.1.3 (#235014)
+- optimize %%configure
+
 * Fri Mar 09 2007 Roland Wolters <wolters.liste@gmx.net> 2.1.2-2
 - update to upstream 2.1.2