rpms/ktorrent/devel .cvsignore, 1.16, 1.17 ktorrent.spec, 1.44, 1.45 sources, 1.16, 1.17

Roland Wolters (liquidat) fedora-extras-commits at redhat.com
Mon Feb 18 21:14:37 UTC 2008 

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29843

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Initial try to create a spec file for KDE 4, ktorrent 3. Since I do not have a 
running KDE 4 here or a running Fedora Rawhide atm I have to test everything
with Koji. Sad, but I have not other possibilities.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	21 Nov 2007 22:33:41 -0000	1.16
+++ .cvsignore	18 Feb 2008 21:13:58 -0000	1.17
@@ -1 +1 @@
-ktorrent-2.2.4.tar.gz
+ktorrent-3.0.0.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ktorrent.spec	1 Dec 2007 17:46:52 -0000	1.44
+++ ktorrent.spec	18 Feb 2008 21:13:58 -0000	1.45
@@ -1,22 +1,20 @@
 %define desktopvendor fedora
 
 Name:           ktorrent
-Version:        2.2.4
-Release:        2%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ktorrent.pwsp.net/
-Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.gz
+Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs3-devel
-BuildRequires:  gettext   
-BuildRequires:  gmp-devel   
-BuildRequires:  avahi-devel   
-BuildRequires:  desktop-file-utils   
-# for 'make -f admin/Makefile.common'   
-BuildRequires:  automake
+BuildRequires:  kdelibsr4-devel >= 4
+BuildRequires:  avahi-devel
+BuildRequires:  cmake   
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -25,45 +23,33 @@
 
 %prep
 %setup -q
-# fix "WARNING:.../Makefile.in seems to ignore the --datarootdir setting"
-make -f admin/Makefile.common
 
 %build
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4}
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+mkdir %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
+
+# validate desktop file
+desktop-file-install --vendor ""                          \
+        --dir %{buildroot}%{_datadir}/applications/kde4   \
+        %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
 %find_lang %{name}
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/ktorrent.desktop
-/usr/bin/desktop-file-install --vendor=""                       \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/kde     \
-        --add-category=X-Fedora                                 \
-        %{buildroot}%{_datadir}/applications/kde/ktorrent.desktop
-
-# Unpackaged files
-rm -f %{buildroot}%{_libdir}/lib*.la
-
 %post
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 /sbin/ldconfig 2>/dev/null
 
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor 2> /dev/null || :
-fi
-
-update-desktop-database &> /dev/null ||:
-
 %postun
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 /sbin/ldconfig 2>/dev/null
 
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -78,80 +64,16 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/ktcachecheck
-%{_bindir}/ktorrent
-%{_bindir}/kttorinfo
-%{_bindir}/ktshell
-%{_bindir}/ktupnptest
-%{_libdir}/libktorrent.so
-%{_libdir}/libktorrent-%{version}.so
-%{_libdir}/kde3/ktinfowidgetplugin.so
-%{_libdir}/kde3/ktinfowidgetplugin.la
-%{_libdir}/kde3/ktipfilterplugin.so
-%{_libdir}/kde3/ktipfilterplugin.la
-%{_libdir}/kde3/ktlogviewerplugin.so
-%{_libdir}/kde3/ktlogviewerplugin.la
-%{_libdir}/kde3/ktpartfileimportplugin.so
-%{_libdir}/kde3/ktpartfileimportplugin.la
-%{_libdir}/kde3/ktrssfeedplugin.so
-%{_libdir}/kde3/ktrssfeedplugin.la
-%{_libdir}/kde3/ktscanfolderplugin.so
-%{_libdir}/kde3/ktscanfolderplugin.la
-%{_libdir}/kde3/ktschedulerplugin.so
-%{_libdir}/kde3/ktschedulerplugin.la
-%{_libdir}/kde3/ktsearchplugin.so
-%{_libdir}/kde3/ktsearchplugin.la
-%{_libdir}/kde3/ktstatsplugin.so
-%{_libdir}/kde3/ktstatsplugin.la
-%{_libdir}/kde3/ktupnpplugin.so
-%{_libdir}/kde3/ktupnpplugin.la
-%{_libdir}/kde3/ktwebinterfaceplugin.so
-%{_libdir}/kde3/ktwebinterfaceplugin.la
-%{_libdir}/kde3/ktzeroconfplugin.so
-%{_libdir}/kde3/ktzeroconfplugin.la
-%{_datadir}/applications/kde/ktorrent.desktop
-%{_datadir}/apps/ktorrent/
-%{_datadir}/config.kcfg/ktlogviewerplugin.kcfg
-%{_datadir}/config.kcfg/ktrssfeedplugin.kcfg
-%{_datadir}/config.kcfg/ktscanfolderplugin.kcfg
-%{_datadir}/config.kcfg/ktschedulerplugin.kcfg
-%{_datadir}/config.kcfg/ktstatsplugin.kcfg
-%{_datadir}/config.kcfg/ktinfowidgetplugin.kcfg
-%{_datadir}/config.kcfg/ktipfilterplugin.kcfg
-%{_datadir}/config.kcfg/ktorrent.kcfg
-%{_datadir}/config.kcfg/ktsearchplugin.kcfg
-%{_datadir}/config.kcfg/ktupnpplugin.kcfg
-%{_datadir}/config.kcfg/ktwebinterfaceplugin.kcfg
-%{_datadir}/icons/hicolor/128x128/apps/ktorrent.png
-%{_datadir}/icons/hicolor/16x16/apps/ktorrent.png
-%{_datadir}/icons/hicolor/22x22/apps/ktorrent.png
-%{_datadir}/icons/hicolor/32x32/apps/ktorrent.png
-%{_datadir}/icons/hicolor/48x48/apps/ktorrent.png
-%{_datadir}/icons/hicolor/64x64/apps/ktorrent.png
-%{_datadir}/icons/hicolor/scalable/apps/ktorrent.svgz
-%{_datadir}/icons/hicolor/128x128/mimetypes/torrent.png
-%{_datadir}/icons/hicolor/16x16/mimetypes/torrent.png
-%{_datadir}/icons/hicolor/22x22/mimetypes/torrent.png
-%{_datadir}/icons/hicolor/32x32/mimetypes/torrent.png
-%{_datadir}/icons/hicolor/48x48/mimetypes/torrent.png
-%{_datadir}/icons/hicolor/64x64/mimetypes/torrent.png
-%{_datadir}/icons/hicolor/scalable/mimetypes/torrent.svgz
-%{_datadir}/services/ktscanfolderplugin.desktop
-%{_datadir}/services/ktschedulerplugin.desktop
-%{_datadir}/services/ktinfowidgetplugin.desktop
-%{_datadir}/services/ktipfilterplugin.desktop
-%{_datadir}/services/ktlogviewerplugin.desktop
-%{_datadir}/services/ktpartfileimportplugin.desktop
-%{_datadir}/services/ktrssfeedplugin.desktop
-%{_datadir}/services/ktsearchplugin.desktop
-%{_datadir}/services/ktstatsplugin.desktop
-%{_datadir}/services/ktupnpplugin.desktop
-%{_datadir}/servicetypes/ktorrentplugin.desktop
-%{_datadir}/services/ktwebinterfaceplugin.desktop
-%{_datadir}/services/ktzeroconfplugin.desktop
+%doc ChangeLog COPYING
 
 %changelog
+* Mon Feb 18 2008 Roland Wolters <wolters.liste at gmx.net> - 3.0.0-1
+- first KDE 4 build
+
+* Sun Jan 27 2008 Roland Wolters <wolters.liste at gmx.net> - 2.2.5-5
+- updated to bugfix version 2.2.5
+- fixed build-system-Qt problem in spec file
+
 * Sat Dec 01 2007 Roland Wolters <wolters.liste at gmx.net> - 2.2.4-2
 - changed build require from kdelibs-devel to kdelibs3-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	21 Nov 2007 22:33:41 -0000	1.16
+++ sources	18 Feb 2008 21:13:58 -0000	1.17
@@ -1 +1 @@
-51baa9ad846290ae9ad492b6a664709a  ktorrent-2.2.4.tar.gz
+83ac02ed0cc10a3158fa2982583d0862  ktorrent-3.0.0.tar.bz2

More information about the fedora-extras-commits mailing list