rpms/knetworkmanager/devel knetworkmanager-0.7-pptp.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 knetworkmanager-svn_checkout.sh, 1.6, 1.7 knetworkmanager.spec, 1.19, 1.20 sources, 1.12, 1.13 dead.package, 1.1, NONE knetworkmanager-svn20080205-run-moc.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Jun 3 17:09:26 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/knetworkmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31861
Modified Files:
.cvsignore knetworkmanager-svn_checkout.sh
knetworkmanager.spec sources
Added Files:
knetworkmanager-0.7-pptp.patch
Removed Files:
dead.package knetworkmanager-svn20080205-run-moc.patch
Log Message:
* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7-0.4.svn20080603
- 20080603 snapshot
- Obsoletes for subpkgs not included
- move crystalsvg icons to hicolor
knetworkmanager-0.7-pptp.patch:
--- NEW FILE knetworkmanager-0.7-pptp.patch ---
diff -up knetworkmanager-0.7/vpn-plugins/Makefile.am.pptp knetworkmanager-0.7/vpn-plugins/Makefile.am
--- knetworkmanager-0.7/vpn-plugins/Makefile.am.pptp 2008-06-02 03:55:41.000000000 -0500
+++ knetworkmanager-0.7/vpn-plugins/Makefile.am 2008-06-03 10:31:46.000000000 -0500
@@ -8,6 +8,6 @@ if WITH_VPNC
SUBDIRS += vpnc
endif
-if WITH_PPTP
-SUBDIRS += pptp
-endif
+#if WITH_PPTP
+#SUBDIRS += pptp
+#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 6 Feb 2008 01:06:02 -0000 1.12
+++ .cvsignore 3 Jun 2008 17:08:12 -0000 1.13
@@ -1 +1 @@
-knetworkmanager-svn20080205.tar.bz2
+knetworkmanager-0.7-20080603svn.tar.bz2
Index: knetworkmanager-svn_checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager-svn_checkout.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- knetworkmanager-svn_checkout.sh 22 Jan 2008 21:43:49 -0000 1.6
+++ knetworkmanager-svn_checkout.sh 3 Jun 2008 17:08:12 -0000 1.7
@@ -1,21 +1,18 @@
#/bin/sh
DATE=$(date +%Y%m%d)
-EXPORT_DIR=knetworkmanager
+EXPORT_DIR=knetworkmanager-0.7
set -x
rm -rf $EXPORT_DIR
-svn --non-recursive export svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network $EXPORT_DIR
# app
-#svn export svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager/ $EXPORT_DIR/knetworkmanager
-svn export svn://anonsvn.kde.org/home/kde/branches/work/knetworkmanager/knetworkmanager-0.7 $EXPORT_DIR/knetworkmanager
+svn export svn://anonsvn.kde.org/home/kde/branches/work/knetworkmanager/knetworkmanager-0.7 $EXPORT_DIR/
# docs
-#svn export svn://anonsvn.kde.org/home/kde/trunk/kdereview/doc/knetworkmanager $EXPORT_DIR/doc/
# auto*/configure bits
svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin $EXPORT_DIR/admin/
-tar cjf knetworkmanager-svn${DATE}.tar.bz2 $EXPORT_DIR
+tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR
# cleanup
rm -rf $EXPORT_DIR
Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- knetworkmanager.spec 6 Feb 2008 02:32:42 -0000 1.19
+++ knetworkmanager.spec 3 Jun 2008 17:08:12 -0000 1.20
@@ -1,133 +1,148 @@
-%define svn svn20080205
+%define svn 20080603svn
Name: knetworkmanager
Version: 0.7
-Release: 0.3.%{svn}%{?dist}
+Release: 0.4.%{svn}%{?dist}
Summary: KDE applet for Network Manager
Group: Applications/Internet
License: GPLv2+
URL: http://en.opensuse.org/Projects/KNetworkManager
-Source0: knetworkmanager-%{svn}.tar.bz2
+Source0: knetworkmanager-%{version}-%{svn}.tar.bz2
#script to make svn tarball
Source1: knetworkmanager-svn_checkout.sh
-
-# automoc is not working or not used properly in src/dbus, so patch it to moc files by hand
-Patch0: knetworkmanager-svn20080205-run-moc.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake autoconf
-BuildRequires: NetworkManager-devel >= 0.7
+Patch1: knetworkmanager-0.7-pptp.patch
+
+BuildRequires: automake libtool
+BuildRequires: dbus-qt3-devel >= 0.8.1
+BuildRequires: NetworkManager-glib-devel >= 0.7
BuildRequires: desktop-file-utils kdelibs3-devel hal-devel wireless-tools-devel
-# yes this really wants two incompatible sets of dbus bindings
-BuildRequires: dbus-qt3-devel libnl-devel dbus-qt-devel
+BuildRequires: libnl-devel
%description
KNetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
-#%package openvpn
-#Summary: knetworkmanager openvpn client
-#Group: Applications/Internet
-#Requires: %{name} = %{version}-%{release}
-#Requires: openvpn
-#
-#%description openvpn
-#openvpn support for KNetworkManager
-#
-#
-#%package vpnc
-#Summary: knetworkmanager vpnc client
-#Group: Applications/Internet
-#Requires: %{name} = %{version}-%{release}
-#Requires: vpnc
-#
-#%description vpnc
-#vpnc support for knetworkmanager
-#
-#%package pptp
-#Summary: knetworkmanager pptp client
-#Group: Applications/Internet
-#Requires: %{name} = %{version}-%{release}
-#Requires: pptp
-#
-#%description pptp
-#pptp support for knetworkmanager
-#
-#%package devel
-#Summary: Development files for %{name}
-#Group: Development/Libraries
-#Requires: %{name} = %{version}-%{release}
-#
-#%description devel
-#%{summary}.
+# upgrade path, until otherwise sorted out -- Rex
+Obsoletes: %{name}-openvpn < %{version}-%{release}
+Obsoletes: %{name}-vpnc < %{version}-%{release}
+Obsoletes: %{name}-pptp < %{version}-%{release}
+Obsoletes: %{name}-devel < %{version}-%{release}
+
+%package openvpn
+Summary: knetworkmanager openvpn client
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+Requires: openvpn
+%description openvpn
+openvpn support for KNetworkManager
+
+%package vpnc
+Summary: knetworkmanager vpnc client
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+Requires: vpnc
+%description vpnc
+vpnc support for knetworkmanager
+
+%package pptp
+Summary: knetworkmanager pptp client
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+Requires: pptp
+%description pptp
+pptp support for knetworkmanager
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description devel
+%{summary}.
+
%prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q -n %{name}-%{version}
+
+%patch1 -p1 -b .pptp
-make -f Makefile.cvs
+make -f admin/Makefile.common
%build
-%configure --disable-rpath --with-openvpn --with-vpnc --with-pptp\
- --disable-warnings
+%configure \
+ --disable-rpath \
+ --disable-warnings
+
+# not smp safe
make
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
desktop-file-install \
---dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+--dir %{buildroot}%{_datadir}/applications/kde \
--vendor="" \
--remove-category=Applet \
--remove-category=Network \
--add-category=System \
---delete-original \
-$RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop
+%{buildroot}%{_datadir}/applications/kde/knetworkmanager.desktop
install -p -m644 -D \
- $RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop \
- $RPM_BUILD_ROOT%{_datadir}/autostart/knetworkmanager-autostart.desktop
+ %{buildroot}%{_datadir}/applications/kde/knetworkmanager.desktop \
+ %{buildroot}%{_datadir}/autostart/knetworkmanager-autostart.desktop
## 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
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
lang=$(basename $lang_dir)
echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
done
fi
+mv %{buildroot}%{_datadir}/icons/crystalsvg \
+ %{buildroot}%{_datadir}/icons/hicolor
+
+## unpackaged files
+# omit these for now, don't feel like re-instating a -devel pkg
+# and dealing with multilib -- Rex
+rm -rf %{buildroot}%{_includedir}
+
+
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
%post
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc knetworkmanager/COPYING knetworkmanager/AUTHORS knetworkmanager/README knetworkmanager/TODO knetworkmanager/NEWS
-%config(noreplace) /etc/dbus-1/system.d/knetworkmanager.conf
+%doc AUTHORS COPYING README TODO NEWS
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
%{_bindir}/knetworkmanager
%{_libdir}/kde3/knetworkmanager.*
%{_libdir}/libkdeinit_knetworkmanager.*
-%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/apps/knetworkmanager/
%{_datadir}/autostart/knetworkmanager-autostart.desktop
-#%{_datadir}/config.kcfg/knetworkmanager.kcfg
%{_datadir}/applications/kde/knetworkmanager.desktop
-#%{_datadir}/servicetypes/knetworkmanager_plugin.desktop
-#%{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
+%{_datadir}/servicetypes/knetworkmanager_plugin.desktop
+%{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
#%files devel
#%defattr(-,root,root,-)
@@ -160,6 +175,11 @@
%changelog
+* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7-0.4.svn20080603
+- 20080603 snapshot
+- Obsoletes for subpkgs not included
+- move crystalsvg icons to hicolor
+
* Wed Feb 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7-0.3.svn20080205
- patch to run moc by hand in src/dbus to work around non-working automoc
- drop unneeded "run make in src/dbus first, then in toplevel" hack
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 6 Feb 2008 01:06:02 -0000 1.12
+++ sources 3 Jun 2008 17:08:12 -0000 1.13
@@ -1 +1 @@
-f675af4bd161fc5bb5b3a1f67eee095a knetworkmanager-svn20080205.tar.bz2
+003a4d5b67a613b43482b2d3e1e0d2a5 knetworkmanager-0.7-20080603svn.tar.bz2
--- dead.package DELETED ---
--- knetworkmanager-svn20080205-run-moc.patch DELETED ---
More information about the fedora-extras-commits
mailing list