rpms/kdenetwork/devel kdenetwork.spec, 1.95, 1.96 kdenetwork-3.4.1-kopete-libgadu-va_copy.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri May 4 16:42:48 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8241
Modified Files:
kdenetwork.spec
Removed Files:
kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
Log Message:
* Fri May 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.6-4
- --enable-sametime-plugin, BR: libmeanwhile-devel
- --enable-slp, BR: openslp-devel
- -nowlistening: --with-xmms, BR: xmms-devel
- BR: libxml2 libxslt
- don't use usermode(gtk) for kppp (allows users to have separate profiles)
- Requires(hint): rdesktop (krdc)
- Requires(hint): qca-tls (kopete: jabber/tls support)
- fixup/simplify scriptlets
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kdenetwork.spec 12 Apr 2007 13:38:22 -0000 1.95
+++ kdenetwork.spec 4 May 2007 16:42:12 -0000 1.96
@@ -1,19 +1,27 @@
+
+# Fedora review: http://bugzilla.redhat.com/195486
+
+## Conditional build:
+# disabled, for now, doesn't build -- Rex
+#define _enable_jingle --enable-jingle
+%define _enable_sametime_plugin --enable-sametime-plugin
+%define _enable_slp --enable-slp
+%define _with_xmms --with_xmms
+%ifnarch s390 s390x
+%define _with_wifi --with-wifi
+%endif
+
+%define console_helper 0
%define debug 0
%define final 1
-%define arts 1
-%define libidn 1
%define make_cvs 1
-%define qt_version 3.3.8
%define kdelibs_epoch 6
%define kdebase_epoch 6
-%define qt_epoch 1
-
-%define appdir %{_datadir}/applications/kde
Name: kdenetwork
Version: 3.5.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: K Desktop Environment - Network Applications
Epoch: 7
@@ -36,26 +44,60 @@
Patch3: kdenetwork-3.3.92-kppp.patch
Patch4: kdenetwork-3.2.3-resolv.patch
-Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): /sbin/chkconfig
+Requires(preun): chkconfig
+Requires(post): /sbin/ldconfig chkconfig
+Requires(postun): /sbin/ldconfig
-%ifnarch s390 s390x
-BuildRequires: wireless-tools-devel >= 25
+BuildRequires: gettext
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+%if %{make_cvs}
+BuildRequires: libtool automake
+%endif
+BuildRequires: coreutils
+BuildRequires: openssl-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: libXmu-devel libXScrnSaver-devel libXtst-devel libXxf86vm-devel
+%endif
+%if "%{?_with_wifi:1}" == "1"
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
+BuildRequires: wireless-tools-devel
+%else
+BuildRequires: wireless-tools
+%endif
+%endif
+%{?_enable_slp:BuildRequires: openslp-devel}
+## kopete:
+BuildRequires: libxml2-devel libxslt-devel
+%ifarch %{ix86}
+# BR: %{_includedir}/valgrind/valgrind.h
+BuildRequires: valgrind
%endif
+#jabber
+BuildRequires: libidn-devel
+#jabber/jingle
+%{?_enable_jingle:BuildRequires: expat-devel glib2-devel ortp-devel speex-devel}
+# jabber/ssl
+Requires(hint): qca-tls
+# sametime
+%{?_enable_sametime_plugin:BuildRequires: meanwhile-devel}
-BuildRequires: qt-devel >= %{qt_version} kdebase-devel libtool automake
-BuildRequires: coreutils libXmu-devel libXxf86vm-devel libXtst-devel openssl-devel
%description
-Networking applications for the K Desktop Environment.
+Networking applications, including:
+* kget: downloader manager.
+* kio_lan: lan browsing kio slave.
+* knewsticker: RDF newsticker applet
+* kopete: chat client
+* kppp: dialer and front end for pppd
+* krdc: a client for Desktop Sharing and other VNC servers
+* krfb: Desktop Sharing server, allow others to access your desktop via VNC
+* lisa: lan information server
%package devel
Summary: Development files for kdenetwork
Group: Development/Libraries
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.
@@ -64,8 +106,6 @@
Summary: Extras packages from KDEnetwork
Group: Applications/Internet
Requires: %{name} = %{epoch}:%{version}-%{release}
-
-
%description extras
More Networking applications for the K Desktop Environment:
* ksirc
@@ -74,21 +114,39 @@
* 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
+%endif
+
+
+
%prep
%setup -q
%patch0 -p1 -b .cvs
%patch1 -p1 -b .dt
-%patch2 -p1 -b .buildroot
+# harmless, not needed -- Rex
+#patch2 -p1 -b .buildroot
+%if %{console_helper}
%patch3 -p1 -b .kppp
-%patch4 -p1 -b .ppp
+%endif
+%patch4 -p1 -b .resolv
-echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -96,10 +154,6 @@
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
- --enable-gcc-hidden-visibility \
-%if %{arts} == 0
- --without-arts \
-%endif
%if %{debug} == 0
--disable-debug \
--disable-warnings \
@@ -107,18 +161,20 @@
%if %{final}
--enable-final \
%endif
- --includedir=%{_includedir}/kde
+ --includedir=%{_includedir}/kde \
+ %{?_enable_jingle} %{!?_enable_jingle:--disable-jingle} \
+ %{?_enable_sametime_plugin} %{!?_enable_sametime_plugin:--disable-sametime-plugin} \
+ %{?_enable_slp} %{!?_enable_slp:--disable-slp} \
+ %{?_with_wifi} %{!?_with_wifi:--without-wifi}
make %{?_smp_mflags}
+
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/etc/pam.d
-cp -p %{SOURCE1} %{buildroot}/etc/pam.d/kppp
-
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
@@ -142,12 +198,14 @@
# Show only in KDE
for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
kwifimanager kget knewsticker ksirc kdict ; do
- if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
- echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+ if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
+ echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
fi
done
+%if %console_helper
# Run kppp through consolehelper
+install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp
mkdir -p %{buildroot}%{_sbindir}
mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
ln -s consolehelper %{buildroot}%{_bindir}/kppp
@@ -157,14 +215,15 @@
PROGRAM=%{_sbindir}/kppp
SESSION=true
EOF
+%endif
-mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
-cp -p %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d
+# ktalk
+install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
# Add lisa startup script
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
-install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
-install -p -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/rc.d/init.d/lisa
+install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
+install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa
+
%post
/sbin/ldconfig
@@ -184,9 +243,10 @@
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%preun
-/sbin/chkconfig --del lisa ||:
-/sbin/service lisa stop > /dev/null 2>&1 ||:
-
+if [ $1 -eq 0 ]; then
+ /sbin/chkconfig --del lisa ||:
+ /sbin/service lisa stop > /dev/null 2>&1 ||:
+fi
%post extras
for f in crystalsvg hicolor ; do
@@ -194,7 +254,6 @@
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
-
%postun extras
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
@@ -217,7 +276,7 @@
%{_datadir}/applications/kde/ksirc.desktop
%{_datadir}/apps/ksirc/
%config(noreplace) %{_datadir}/config/ksircrc
-%{_datadir}/icons/hicolor/??x??/apps/ksirc.png
+%{_datadir}/icons/hicolor/*/apps/ksirc.*
# kdict
%doc %{_docdir}/HTML/en/kdict
@@ -227,9 +286,7 @@
%{_datadir}/applications/kde/kdict.desktop
%{_datadir}/apps/kdict
%{_datadir}/apps/kicker/applets/kdictapplet.desktop
-%{_datadir}/icons/hicolor/128x128/apps/kdict.png
-%{_datadir}/icons/hicolor/??x??/apps/kdict.png
-%{_datadir}/icons/hicolor/scalable/apps/kdict.svgz
+%{_datadir}/icons/hicolor/*/apps/kdict.*
# ktalk
%doc %{_docdir}/HTML/en/ktalkd
@@ -237,8 +294,7 @@
%{_libdir}/kde3/kcm_ktalkd.*
%{_datadir}/applications/kde/kcmktalkd.desktop
%config(noreplace) %{_datadir}/config/ktalkdrc
-%{_datadir}/icons/crystalsvg/128x128/apps/ktalkd.png
-%{_datadir}/icons/crystalsvg/??x??/apps/ktalkd.png
+%{_datadir}/icons/crystalsvg/*/apps/ktalkd.*
%{_datadir}/sounds/ktalkd.wav
%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
@@ -246,10 +302,10 @@
%doc %{_docdir}/HTML/en/kpf
%{_libdir}/kde3/kpf*
%{_datadir}/apps/kicker/applets/kpfapplet.desktop
-%{_datadir}/icons/crystalsvg/??x??/apps/kpf.png
+%{_datadir}/icons/crystalsvg/*/apps/kpf.*
%{_datadir}/services/kpfpropertiesdialogplugin.desktop
-%ifnarch s390 s390x
+%if "%{?_with_wifi:1}" == "1"
# kwifimanager
%doc %{_docdir}/HTML/en/kwifimanager
%{_bindir}/kwifimanager
@@ -257,16 +313,13 @@
%{_datadir}/applications/kde/kcmwifi.desktop
%{_datadir}/applications/kde/kwifimanager.desktop
%{_datadir}/apps/kwifimanager
-%{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png
-%{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png
-%{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz
+%{_datadir}/icons/hicolor/*/apps/kwifimanager.png
%endif
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING README
-
# ksirc
%exclude %{_bindir}/ksirc
%exclude %{_libdir}/libkdeinit_ksirc.*
@@ -277,7 +330,6 @@
%exclude %{_docdir}/HTML/??/ksirc/
%exclude %{_datadir}/icons/hicolor/??x??/apps/ksirc.png
-
# kdict
%exclude %{_docdir}/HTML/en/kdict
%exclude %{_bindir}/kdict
@@ -290,7 +342,6 @@
%exclude %{_datadir}/icons/hicolor/??x??/apps/kdict.png
%exclude %{_datadir}/icons/hicolor/scalable/apps/kdict.svgz
-
# ktalk
%exclude %{_docdir}/HTML/en/ktalkd
%exclude %{_sysconfdir}/xinetd.d/ktalk
@@ -302,7 +353,6 @@
%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ktalkd.png
%exclude %{_datadir}/sounds/ktalkd.wav
-
# kpf
%exclude %{_libdir}/kde3/kpf*
%exclude %{_datadir}/apps/kicker/applets/kpfapplet.desktop
@@ -323,21 +373,34 @@
%exclude %{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz
%endif
+# nowlistening
+%if "%{?_with_xmms:1}" == "1"
+%exclude %{_datadir}/apps/kopete/*nowlisteningchatui*
+%exclude %{_datadir}/apps/kopete/*nowlisteningui*
+%exclude %{_datadir}/services/kconfiguredialog/*nowlistening*
+%exclude %{_datadir}/services/*nowlistening*
+%exclude %{_libdir}/kde3/*nowlistening*
+%endif
+
%doc %{_docdir}/HTML/en/*
+%if %console_helper
%config(noreplace) /etc/security/console.apps/kppp
%config(noreplace) /etc/pam.d/kppp
+%{_sbindir}/kppp
+%else
+%attr(4755,root,root) %{_bindir}/kppp
+%endif
%config(noreplace) %{_sysconfdir}/lisarc
-%config(noreplace) %{_sysconfdir}/rc.d/init.d/lisa
+%config(noreplace) %{_initrddir}/lisa
%{_libdir}/*.so.*
%{_libdir}/libkdeinit_*.so
-%ifnarch s390 s390x
+%if "%{?_with_wifi:1}" == "1"
%{_libdir}/libkwireless.so
%endif
%{_libdir}/*.la
%{_libdir}/kde3/*
%{_libdir}/kconf_update_bin/*
%{_bindir}/*
-%{_sbindir}/*
%{_datadir}/apps/*
%{_datadir}/applications/kde/*
%{_datadir}/applnk/.hidden/*
@@ -349,17 +412,38 @@
%{_datadir}/servicetypes/*
%{_datadir}/sounds/*
-
%files devel
%defattr(-,root,root)
%{_includedir}/kde/*
%{_libdir}/lib*.so
%exclude %{_libdir}/libkdeinit_*.so
-%ifnarch s390 s390x
+%if "%{?_with_wifi:1}" == "1"
%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
+* Fri May 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.6-4
+- --enable-sametime-plugin, BR: libmeanwhile-devel
+- --enable-slp, BR: openslp-devel
+- -nowlistening: --with-xmms, BR: xmms-devel
+- BR: libxml2 libxslt
+- don't use usermode(gtk) for kppp (allows users to have separate profiles)
+- Requires(hint): rdesktop (krdc)
+- Requires(hint): qca-tls (kopete: jabber/tls support)
+- fixup/simplify scriptlets
+
* Thu Apr 12 2007 Than Ngo <than at redhat.com> - 7:3.5.6-3.fc7
- cleanup
- apply CVS upstream patches
--- kdenetwork-3.4.1-kopete-libgadu-va_copy.patch DELETED ---
More information about the fedora-extras-commits
mailing list