rpms/kdenetwork/devel kdenetwork.spec,1.100,1.101
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Aug 29 11:52:14 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12679
Modified Files:
kdenetwork.spec
Log Message:
* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-3
- License: GPLv2
- Provides: kdenetwork3(-devel)
- move -nowlistening subpkg bits into -extras
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdenetwork.spec 29 Aug 2007 06:01:19 -0000 1.100
+++ kdenetwork.spec 29 Aug 2007 11:51:42 -0000 1.101
@@ -6,7 +6,7 @@
#define _enable_jingle --enable-jingle
%define _enable_sametime_plugin --enable-sametime-plugin
%define _enable_slp --enable-slp
-%define _with_xmms --with_xmms
+%define _with_xmms --with-xmms
%ifnarch s390 s390x
%define _with_wifi --with-wifi
%endif
@@ -16,19 +16,18 @@
%define final 1
%define make_cvs 1
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
-
Name: kdenetwork
Epoch: 7
Version: 3.5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: K Desktop Environment - Network Applications
-License: GPL
+License: GPLv2
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides: kdenetwork3 = %{version}-%{release}
+
Url: http://www.kde.org
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: kppp.pamd
@@ -46,7 +45,7 @@
Requires(postun): /sbin/ldconfig
BuildRequires: gettext
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
%if %{make_cvs}
BuildRequires: libtool automake
%endif
@@ -77,6 +76,7 @@
Requires(hint): qca-tls
# sametime
%{?_enable_sametime_plugin:BuildRequires: meanwhile-devel}
+%{?_with_xmms:BuildRequires: xmms-devel}
%description
@@ -91,18 +91,22 @@
* lisa: lan information server
%package devel
-Summary: Development files for kdenetwork
+Summary: Development files for %{name}
Group: Development/Libraries
+Provides: kdenetwork3-devel = %{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: kdelibs-devel
%description devel
-Development files for kdenetwork. Install kdenetwork-devel if you wish
-to develop or compile KDE networking applications.
+%{summary}.
%package extras
-Summary: Extras packages from KDEnetwork
+Summary: Extras packages for %{name}
Group: Applications/Internet
Requires: %{name} = %{epoch}:%{version}-%{release}
+%if "%{?_with_xmms:1}" == "1"
+Obsoletes: %{name}-nowlistenting < %{epoch}:%{version}-%{release}
+Provides: %{name}-nowlistenting = %{epoch}:%{version}-%{release}
+%endif
%description extras
More Networking applications for the K Desktop Environment:
* ksirc
@@ -110,22 +114,11 @@
* ktalkd
* kpf
* kwifimanager
-
-# Should this just go into -extras? -- Rex
%if "%{?_with_xmms:1}" == "1"
-%package nowlistening
-Summary: Xmms plugin for Kopete
-Group: Applications/Multimedia
-BuildRequires: xmms-devel
-Requires: %{name} = %{epoch}:%{version}-%{release}
-%description nowlistening
-%{summary}.
-%else
-BuildConflicts: xmms-devel
+ * nowlistening (xmms) plugin for Kopete.
%endif
-
%prep
%setup -q
@@ -311,8 +304,18 @@
%{_datadir}/icons/hicolor/*/apps/kwifimanager.png
%endif
+%if "%{?_with_xmms:1}" == "1"
+#files nowlistening
+#defattr(-,root,root,-)
+%{_datadir}/apps/kopete/*nowlisteningchatui*
+%{_datadir}/apps/kopete/*nowlisteningui*
+%{_datadir}/services/kconfiguredialog/*nowlistening*
+%{_datadir}/services/*nowlistening*
+%{_libdir}/kde3/*nowlistening*
+%endif
+
%files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc AUTHORS COPYING README
# ksirc
@@ -377,7 +380,7 @@
%exclude %{_libdir}/kde3/*nowlistening*
%endif
-%doc %{_docdir}/HTML/en/*
+%{_docdir}/HTML/en/*
%if %console_helper
%config(noreplace) /etc/security/console.apps/kppp
%config(noreplace) /etc/pam.d/kppp
@@ -408,7 +411,7 @@
%{_datadir}/sounds/*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/kde/*
%{_libdir}/lib*.so
%exclude %{_libdir}/libkdeinit_*.so
@@ -416,19 +419,13 @@
%exclude %{_libdir}/libkwireless.so
%endif
-%if "%{?_with_xmms:1}" == "1"
-%files nowlistening
-%defattr(-,root,root,-)
-%{_datadir}/apps/kopete/*nowlisteningchatui*
-%{_datadir}/apps/kopete/*nowlisteningui*
-%{_datadir}/services/kconfiguredialog/*nowlistening*
-%{_datadir}/services/*nowlistening*
-%{_libdir}/kde3/*nowlistening*
-%endif
-
-
%changelog
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-3
+- License: GPLv2
+- Provides: kdenetwork3(-devel)
+- move -nowlistening subpkg bits into -extras
+
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 7:3.5.7-2
- Rebuild for selinux ppc32 issue.
More information about the fedora-extras-commits
mailing list