rpms/kdeadmin/F-7 kdeadmin-3.5.7-knetworkconf.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 kdeadmin.spec, 1.77, 1.78 sources, 1.38, 1.39 kdeadmin-3.5.7-knetworkconf-f7.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Oct 25 02:18:23 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdeadmin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4861
Modified Files:
.cvsignore kdeadmin.spec sources
Added Files:
kdeadmin-3.5.7-knetworkconf.patch
Removed Files:
kdeadmin-3.5.7-knetworkconf-f7.patch
Log Message:
sync w/ devel/, kde-3.5.8
kdeadmin-3.5.7-knetworkconf.patch:
--- NEW FILE kdeadmin-3.5.7-knetworkconf.patch ---
--- kdeadmin-3.5.7/knetworkconf/backends/network.pl.in.knetworkconf 2007-05-14 02:37:27.000000000 -0500
+++ kdeadmin-3.5.7/knetworkconf/backends/network.pl.in 2007-06-16 17:46:41.000000000 -0500
@@ -531,6 +531,9 @@ sub gst_network_get_broadcast_ping_cmd
"fedora-3" => "redhat-6.2",
"fedora-4" => "redhat-6.2",
"fedora-5" => "redhat-6.2",
+ "fedora-6" => "redhat-6.2",
+ "fedora-7" => "redhat-6.2",
+ "fedora-8" => "redhat-6.2",
"rpath" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
"vine-3.1" => "redhat-6.2",
@@ -1843,6 +1846,9 @@ sub gst_network_get_file
"fedora-3" => \&gst_network_rh72_get_file,
"fedora-4" => \&gst_network_rh72_get_file,
"fedora-5" => \&gst_network_rh72_get_file,
+ "fedora-6" => \&gst_network_rh72_get_file,
+ "fedora-7" => \&gst_network_rh72_get_file,
+ "fedora-8" => \&gst_network_rh72_get_file,
"rpath" => \&gst_network_rh72_get_file,
"vine-3.0" => \&gst_network_rh62_get_file,
"vine-3.1" => \&gst_network_rh62_get_file,
@@ -3971,6 +3977,9 @@ sub gst_network_ensure_loopback_interfac
"fedora-3" => "",
"fedora-4" => "",
"fedora-5" => "",
+ "fedora-6" => "",
+ "fedora-7" => "",
+ "fedora-8" => "",
"rpath" => "",
"vine-3.0" => "lo",
"vine-3.1" => "lo",
@@ -4144,6 +4153,9 @@ sub gst_network_get_parse_table
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
+ "fedora-7" => "redhat-7.2",
+ "fedora-8" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -4573,6 +4585,9 @@ sub gst_network_get_interface_parse_tabl
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
+ "fedora-7" => "redhat-7.2",
+ "fedora-8" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
@@ -5419,6 +5434,9 @@ sub gst_network_get_replace_table
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
+ "fedora-7" => "redhat-7.2",
+ "fedora-8" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -5833,6 +5851,9 @@ sub gst_network_get_interface_replace_ta
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
+ "fedora-7" => "redhat-7.2",
+ "fedora-8" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
--- kdeadmin-3.5.7/knetworkconf/backends/platform.pl.in.knetworkconf 2007-05-14 02:37:27.000000000 -0500
+++ kdeadmin-3.5.7/knetworkconf/backends/platform.pl.in 2007-06-16 17:44:05.000000000 -0500
@@ -104,6 +104,9 @@ $PLATFORM_INFO = {
"fedora-3" => "Fedora Core 3 (Heidelberg)",
"fedora-4" => "Fedora Core 4 (Stentz)",
"fedora-5" => "Fedora Core 5 (Bordeaux)",
+ "fedora-6" => "Fedora Core 6 (Zod)",
+ "fedora-7" => "Fedora release 7 (Moonshine)",
+ "fedora-8" => "Fedora release 8",
"rpath" => "rPath Linux",
"ark" => "Ark Linux",
};
--- kdeadmin-3.5.7/knetworkconf/backends/service.pl.in.knetworkconf 2007-05-14 02:37:27.000000000 -0500
+++ kdeadmin-3.5.7/knetworkconf/backends/service.pl.in 2007-06-16 17:47:32.000000000 -0500
@@ -106,6 +106,9 @@ sub gst_service_sysv_get_paths
"fedora-3" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"fedora-4" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora-7" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora-8" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -184,6 +187,9 @@ sub gst_service_sysv_get_runlevels
"fedora-3" => [3, 5],
"fedora-4" => [3, 5],
"fedora-5" => [3, 5],
+ "fedora-6" => [3, 5],
+ "fedora-7" => [3, 5],
+ "fedora-8" => [3, 5],
"rpath" => [3, 5],
"vine-3.0" => [3, 5],
@@ -259,6 +265,9 @@ sub gst_service_get_runlevel_roles
"fedora-3" => "redhat-5.2",
"fedora-4" => "redhat-5.2",
"fedora-5" => "redhat-5.2",
+ "fedora-6" => "redhat-5.2",
+ "fedora-7" => "redhat-5.2",
+ "fedora-8" => "redhat-5.2",
"rpath" => "redhat-5.2",
"vine-3.0" => "redhat-5.2",
@@ -1742,7 +1751,9 @@ sub gst_service_get_status
"fedora-3" => \&gst_service_redhat_get_status,
"fedora-4" => \&gst_service_redhat_get_status,
"fedora-5" => \&gst_service_redhat_get_status,
-
+ "fedora-6" => \&gst_service_redhat_get_status,
+ "fedora-7" => \&gst_service_redhat_get_status,
+ "fedora-8" => \&gst_service_redhat_get_status,
"rpath" => \&gst_service_redhat_get_status,
"suse-9.0" => \&gst_service_suse_get_status,
--- kdeadmin-3.5.7/knetworkconf/backends/network-conf.in.knetworkconf 2007-05-14 02:37:27.000000000 -0500
+++ kdeadmin-3.5.7/knetworkconf/backends/network-conf.in 2007-06-16 17:44:05.000000000 -0500
@@ -72,7 +72,7 @@ $version = "@VERSION@";
"debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-testing",
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10",
"suse-7.0", "suse-9.0", "suse-9.1",
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
+ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "fedora-6", "fedora-7", "fedora-8", "rpath",
"pld-1.0", "pld-1.1", "pld-1.99",
"conectiva-9", "conectiva-10",
"vine-3.0", "vine-3.1",
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-7/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 11 Jun 2007 18:20:14 -0000 1.36
+++ .cvsignore 25 Oct 2007 02:17:49 -0000 1.37
@@ -1 +1,2 @@
kdeadmin-3.5.7.tar.bz2
+kdeadmin-3.5.8.tar.bz2
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-7/kdeadmin.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kdeadmin.spec 11 Jun 2007 20:56:40 -0000 1.77
+++ kdeadmin.spec 25 Oct 2007 02:17:49 -0000 1.78
@@ -1,19 +1,14 @@
-%define rhel 0
-%define make_cvs 1
-
-%define qt_version 3.3.8
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
+%define make_cvs 0
%define console_helper 1
Name: kdeadmin
-Summary: Administrative tools for KDE.
+Summary: Administrative tools for KDE
Epoch: 7
-Version: 3.5.7
-Release: 1%{?dist}.1
+Version: 3.5.8
+Release: 1%{?dist}
-License: GPL
+License: GPLv2
URL: http://www.kde.org/
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,19 +22,16 @@
Source6: ksysvrc
Source7: kuserrc
-Patch0: kdeadmin-3.5.7-knetworkconf-f7.patch
+Patch0: kdeadmin-3.5.7-knetworkconf.patch
-Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdelibs3 >= %{version}
Requires: pkgconfig
Requires: usermode
%if %{make_cvs}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: automake libtool
%endif
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
BuildRequires: rpm-devel
%description
@@ -47,12 +39,13 @@
Environment (KDE) including:
kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
+
%prep
%setup -q
-%patch0 -p1 -b .f7
+%patch0 -p1 -b .knetworkconf
-%if %{rhel}
+%if 0%{?rhel} > 1
echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"' >ksysv/configure.in.in
echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kuser"' >kuser/configure.in.in
@@ -63,6 +56,7 @@
make -f admin/Makefile.common cvs
%endif
+
%build
unset QTDIR && . /etc/profile.d/qt.sh
@@ -81,7 +75,7 @@
make install DESTDIR=%{buildroot}
-%if %{rhel}
+%if 0%{?rhel} > 1
comps="kcron kdat knetworkconf"
rm -rf %{buildroot}%{_docdir}/HTML/en/kuser \
%{buildroot}%{_docdir}/HTML/en/kpackage \
@@ -97,15 +91,15 @@
install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/
# Run kuser through consolehelper
-install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
-install -c -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
+install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
+install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir}
ln -s consolehelper %{buildroot}%{_bindir}/kuser
%if %{console_helper}
# Run kpackage through consolehelper
-install -c -m 644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
-install -m 0644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
+install -p -m644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
+install -p -m644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
mv %{buildroot}%{_bindir}/kpackage %{buildroot}%{_sbindir}
ln -s consolehelper %{buildroot}%{_bindir}/kpackage
%endif
@@ -151,22 +145,24 @@
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
%clean
rm -rf %{buildroot}
+
%files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%doc rpmdocs/*
%{_bindir}/*
-%if !%{rhel}
+%if 0%{?rhel} < 1
%{_sbindir}/*
%config(noreplace) /etc/pam.d/*
%config(noreplace) /etc/security/console.apps/*
%endif
%{_datadir}/apps/*
%{_datadir}/applications/kde/*.desktop
-%config(noreplace) %{_datadir}/config*/*
+%{_datadir}/config*/*
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/icons/locolor/*/*/*
@@ -175,9 +171,19 @@
%{_libdir}/kde3/*
%{_libdir}/pkgconfig/*.pc
+
%changelog
-* Mon Jun 11 2007 Than Ngo <than at redhat.com> - 7:3.5.7-1.fc7.1
-- add F7 support in knetworkconf
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-1
+- kde-3.5.8
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-3
+- License: GPLv2
+- (Build)Requires: kdelibs3(-devel)
+- drop Requires: kdebase
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-2
+- update knetworkconf patch
+- portability (rhel) bits
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-1
- kdeadmin-3.5.7
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-7/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 11 Jun 2007 18:20:14 -0000 1.38
+++ sources 25 Oct 2007 02:17:49 -0000 1.39
@@ -1 +1 @@
-fdf4e7e230d9b5688d72f0e1a8039e12 kdeadmin-3.5.7.tar.bz2
+324a44d854a92177e71954f9264c98a8 kdeadmin-3.5.8.tar.bz2
--- kdeadmin-3.5.7-knetworkconf-f7.patch DELETED ---
More information about the fedora-extras-commits
mailing list