[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kdeadmin/devel kdeadmin-3.5.2-knetworkconf-fedora.patch, NONE, 1.1 kdeadmin.spec, 1.57, 1.58

Author: than

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1586

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-3.5.2-knetworkconf-fedora.patch 
Log Message:
add support Fedora Core release 5



kdeadmin-3.5.2-knetworkconf-fedora.patch:
 network-conf.in |    2 +-
 network.pl.in   |    7 +++++++
 platform.pl.in  |    1 +
 service.pl.in   |    4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE kdeadmin-3.5.2-knetworkconf-fedora.patch ---
--- kdeadmin-3.5.2/knetworkconf/backends/network.pl.in.orig	2006-05-17 21:08:23.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/network.pl.in	2006-05-17 21:09:50.000000000 +0200
@@ -523,6 +523,7 @@
        "fedora-2"     => "redhat-6.2",
        "fedora-3"     => "redhat-6.2",
        "fedora-4"     => "redhat-6.2",
+       "fedora-5"     => "redhat-6.2",
        "rpath"        => "redhat-6.2",
        "vine-3.0"     => "redhat-6.2",
        "vine-3.1"     => "redhat-6.2",
@@ -1827,6 +1828,7 @@
           "fedora-2"     => \&gst_network_rh72_get_file,
           "fedora-3"     => \&gst_network_rh72_get_file,
           "fedora-4"     => \&gst_network_rh72_get_file,
+          "fedora-5"     => \&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,
@@ -3947,6 +3949,7 @@
           "fedora-2"     => "",
           "fedora-3"     => "",
           "fedora-4"     => "",
+          "fedora-5"     => "",
           "rpath"        => "",
           "vine-3.0"     => "lo",
           "vine-3.1"     => "lo",
@@ -4112,6 +4115,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -4533,6 +4537,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
@@ -5371,6 +5376,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -5777,6 +5783,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
--- kdeadmin-3.5.2/knetworkconf/backends/platform.pl.in.orig	2006-05-17 20:46:12.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/platform.pl.in	2006-05-17 20:59:34.000000000 +0200
@@ -96,6 +96,7 @@
   "fedora-2"        => "Fedora Core 2 (Tettnang)",
   "fedora-3"        => "Fedora Core 3 (Heidelberg)",
   "fedora-4"        => "Fedora Core 4 (Stentz)",
+  "fedora-5"        => "Fedora Core 5 (Bordeaux)",
   "rpath"           => "rPath Linux",
   "ark"             => "Ark Linux",
 };
--- kdeadmin-3.5.2/knetworkconf/backends/service.pl.in.orig	2006-05-17 21:10:34.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/service.pl.in	2006-05-17 21:12:00.000000000 +0200
@@ -99,6 +99,7 @@
        "fedora-2"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "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"],
        "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"],
@@ -169,6 +170,7 @@
        "fedora-2"       => [3, 5],
        "fedora-3"       => [3, 5],
        "fedora-4"       => [3, 5],
+       "fedora-5"       => [3, 5],
        "rpath"          => [3, 5],
        
        "vine-3.0"       => [3, 5],
@@ -236,6 +238,7 @@
      "fedora-2"       => "redhat-5.2",
      "fedora-3"       => "redhat-5.2",
      "fedora-4"       => "redhat-5.2",
+     "fedora-5"       => "redhat-5.2",
      "rpath"          => "redhat-5.2",
 
      "vine-3.0"       => "redhat-5.2",
@@ -1713,6 +1716,7 @@
        "fedora-2"     => \&gst_service_redhat_get_status,
        "fedora-3"     => \&gst_service_redhat_get_status,
        "fedora-4"     => \&gst_service_redhat_get_status,
+       "fedora-5"     => \&gst_service_redhat_get_status,
 
        "rpath"        => \&gst_service_redhat_get_status,
 
--- kdeadmin-3.5.2/knetworkconf/backends/network-conf.in.orig	2006-05-17 21:12:30.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/network-conf.in	2006-05-17 21:12:52.000000000 +0200
@@ -71,7 +71,7 @@
               "debian-2.2", "debian-3.0", "debian-sarge",
               "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.04",
               "suse-7.0", "suse-9.0", "suse-9.1",
-              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "rpath",
+              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
               "pld-1.0", "pld-1.1", "pld-1.99",
               "conectiva-9", "conectiva-10",
               "vine-3.0", "vine-3.1",


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdeadmin.spec	5 Apr 2006 14:16:12 -0000	1.57
+++ kdeadmin.spec	17 May 2006 19:24:47 -0000	1.58
@@ -26,7 +26,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.2
-Release: 1
+Release: 2
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -43,6 +43,9 @@
 
 Patch1: kde-libtool.patch
 
+# upstream patches
+Patch100: kdeadmin-3.5.2-knetworkconf-fedora.patch
+
 Requires(post,postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -155,6 +158,9 @@
 %setup -q
 %patch1 -p1 -b .libtool
 
+# upstream patches
+%patch100 -p1 -b .knetworkconf-fedora
+
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
 %endif
@@ -222,12 +228,12 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # don't use, just delete. Our own versions come later.
-rm -rf $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security
+rm -rf %{buildroot}/etc/pam.d %{buildroot}/etc/security
 
 # fix absolute symbolic links
 (
@@ -238,8 +244,8 @@
   %if %{kuser}
   rpmlist="$rpmlist kuser"
   %endif
-  mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
-  cd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+  mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+  cd %{buildroot}%{_docdir}/HTML/en
   for i in $rpmlist ; do
     cd $i && ln -nfs ../common .
     cd ..
@@ -248,8 +254,8 @@
 
 # Put in some sane defaults
 %if %{kuser}
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-  cat >$RPM_BUILD_ROOT%{_datadir}/config/kuserrc <<EOF
+  mkdir -p %{buildroot}%{_datadir}/config
+  cat >%{buildroot}%{_datadir}/config/kuserrc <<EOF
 [template]
 copySkel=true
 createHomeDir=true
@@ -260,7 +266,7 @@
 %endif
 
 %if %{ksysv}
-  cat >$RPM_BUILD_ROOT%{_datadir}/config/ksysvrc <<EOF
+  cat >%{buildroot}%{_datadir}/config/ksysvrc <<EOF
 [Other Settings]
 Configured=true
 [Path Settings]
@@ -271,63 +277,63 @@
 EOF
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps \
-         $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/usr/sbin
+mkdir -p %{buildroot}/etc/security/console.apps \
+         %{buildroot}/etc/pam.d %{buildroot}/usr/sbin
 
 # Runkuser through consolehelper
 %if %{kuser}
-  mv $RPM_BUILD_ROOT/usr/bin/kuser $RPM_BUILD_ROOT/usr/sbin
-  install -c -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/security/console.apps/kuser
-  install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/kuser
-  ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kuser
+  mv %{buildroot}%{_bindir}/kuser %{buildroot}/usr/sbin
+  install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
+  install -c -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
+  ln -s consolehelper %{buildroot}%{_bindir}/kuser
 %endif
 
 %if %{kpackage}
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-  install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/security/console.apps/kpackage
-  install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/kpackage
-  install -c -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/config
-  mv $RPM_BUILD_ROOT/usr/bin/kpackager $RPM_BUILD_ROOT/usr/sbin
-  ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kpackager
+  mkdir -p %{buildroot}%{_datadir}/config
+  install -c -m 644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
+  install -m 0644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
+  install -c -m 644 %{SOURCE5} %{buildroot}%{_datadir}/config
+  mv %{buildroot}%{_bindir}/kpackager %{buildroot}/usr/sbin
+  ln -s consolehelper %{buildroot}%{_bindir}/kpackager
 %endif
 
 %if ! %{kcron}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kcron
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kcron
 %endif
 
 %if ! %{kdat}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdat
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kdat
 %endif
 
 %if ! %{kpackage}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kpackage
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kpackage
 %endif
 
 %if ! %{ksysv}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksysv
+  rm -rf %{buildroot}%{_docdir}/HTML/en/ksysv
 %endif
 
 %if ! %{kuser}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kuser
+  rm -rf %{buildroot}%{_docdir}/HTML/en/kuser
 %endif
 
 %if ! %{lilo}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/lilo-config
+  rm -rf %{buildroot}%{_docdir}/HTML/en/lilo-config
 %endif
 
 desktop-file-install \
    --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
+   --dir %{buildroot}%{appdir} \
    --delete-original \
    --add-only-show-in KDE \
-   $RPM_BUILD_ROOT%{appdir}/kuser.desktop
+   %{buildroot}%{appdir}/kuser.desktop
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -405,6 +411,9 @@
 %endif
 
 %changelog
+* Wed May 17 2006 Than Ngo <than redhat com> 7:3.5.2-2
+- add support Fedora Core release 5
+
 * Wed Apr 05 2006 Than Ngo <than redhat com> 7:3.5.2-1
 - update to 3.5.2
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]