]> git.pld-linux.org Git - packages/NetworkManager.git/commitdiff
projects / packages / NetworkManager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4658eec)
- updated for 0.8.2 auto/th/NetworkManager-0_8_2-1
authorMarcin Banasiak <marcin.banasiak@gmail.com>
Fri, 5 Nov 2010 11:02:53 +0000 (11:02 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    NetworkManager-pld.patch -> 1.15

NetworkManager-pld.patch patch | blob | blame | history

diff --git a/NetworkManager-pld.patch b/NetworkManager-pld.patch
index 059964248779b03210fb2d7e9ea6a9322ac82d3f..9405e7bb95310f3f0a9de07965053aaf8a2add2b 100644 (file)
--- a/NetworkManager-pld.patch
+++ b/NetworkManager-pld.patch
@@ -1,26 +1,34 @@
-diff -urN NetworkManager-0.7.2/configure.ac NetworkManager-0.7.2.new/configure.ac
---- NetworkManager-0.7.2/configure.ac  2009-11-23 20:24:09.000000000 +0100
-+++ NetworkManager-0.7.2.new/configure.ac      2009-11-26 22:05:02.396072295 +0100
-@@ -83,7 +83,7 @@
+diff -urN NetworkManager-0.8.2/configure.ac NetworkManager-0.8.2.new//configure.ac
+--- NetworkManager-0.8.2/configure.ac  2010-11-03 21:10:45.000000000 +0100
++++ NetworkManager-0.8.2.new//configure.ac     2010-11-04 23:08:43.530778095 +0100
+@@ -84,7 +84,7 @@
  dnl
  AC_C_BIGENDIAN
  
--AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva or pardus]))
-+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus or pld]))
+-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus or linexa]))
++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa or pld]))
  if test "z$with_distro" = "z"; then
        AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
        AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-@@ -105,7 +106,7 @@
+@@ -97,6 +97,7 @@
+       AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
+       AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
+       AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa")
++      AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
+       if test "z$with_distro" = "z"; then
+               with_distro=`lsb_release -is`
+       fi
+@@ -108,7 +109,7 @@
        exit 1
  else
        case $with_distro in
--              redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus) ;;
-+              redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|pld) ;;
+-              redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa) ;;
++              redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|pld) ;;
                *)
                        echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
                        exit 1
-@@ -164,6 +165,11 @@
-   AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus])
+@@ -171,6 +172,11 @@
+   AC_DEFINE(TARGET_LINEXA, 1, [Define if you have linexa])
  fi
  
 +AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
@@ -28,52 +36,40 @@ diff -urN NetworkManager-0.7.2/configure.ac NetworkManager-0.7.2.new/configure.a
 +  AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
 +fi
 +
- AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
- AC_TRY_COMPILE([#ifndef __user
-                 #define __user
-@@ -164,6 +165,11 @@
-   AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus])
- fi
-
-+AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
-+if test x"$with_distro" = xpld; then
-+  AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
-+fi
-+
- AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
- AC_TRY_COMPILE([#ifndef __user
-                 #define __user
-@@ -513,6 +519,8 @@
+ dnl
+ dnl Distribution version string
+ dnl
+@@ -549,6 +555,8 @@
  initscript/paldo/NetworkManager
  initscript/Mandriva/Makefile
  initscript/Mandriva/networkmanager
 +initscript/PLD/Makefile
 +initscript/PLD/NetworkManager
+ initscript/linexa/Makefile
+ initscript/linexa/networkmanager
  introspection/Makefile
- man/Makefile
- man/NetworkManager.8
-diff -urN NetworkManager-0.7.2/initscript/Makefile.am NetworkManager-0.7.2.new/initscript/Makefile.am
---- NetworkManager-0.7.2/initscript/Makefile.am        2009-08-28 17:53:17.000000000 +0200
-+++ NetworkManager-0.7.2.new/initscript/Makefile.am    2009-11-26 22:05:31.383612264 +0100
-@@ -23,3 +23,6 @@
- if TARGET_MANDRIVA
- SUBDIRS += Mandriva
+diff -urN NetworkManager-0.8.2/initscript/Makefile.am NetworkManager-0.8.2.new//initscript/Makefile.am
+--- NetworkManager-0.8.2/initscript/Makefile.am        2010-10-19 01:44:05.000000000 +0200
++++ NetworkManager-0.8.2.new//initscript/Makefile.am   2010-11-04 23:09:47.487444761 +0100
+@@ -26,3 +26,6 @@
+ if TARGET_LINEXA
+ SUBDIRS += linexa
  endif
 +if TARGET_PLD
 +SUBDIRS += PLD
 +endif
-diff -urN NetworkManager-0.7.2/initscript/PLD/Makefile.am NetworkManager-0.7.2.new/initscript/PLD/Makefile.am
---- NetworkManager-0.7.2/initscript/PLD/Makefile.am    1970-01-01 01:00:00.000000000 +0100
-+++ NetworkManager-0.7.2.new/initscript/PLD/Makefile.am        2009-11-26 22:06:44.072745786 +0100
+diff -urN NetworkManager-0.8.2/initscript/PLD/Makefile.am NetworkManager-0.8.2.new//initscript/PLD/Makefile.am
+--- NetworkManager-0.8.2/initscript/PLD/Makefile.am    1970-01-01 01:00:00.000000000 +0100
++++ NetworkManager-0.8.2.new//initscript/PLD/Makefile.am       2010-11-04 21:54:27.000000000 +0100
 @@ -0,0 +1,5 @@
 +EXTRA_DIST = NetworkManager
 +DISTCLEANFILES = NetworkManager
 +
 +initddir = $(sysconfdir)/rc.d/init.d
 +initd_SCRIPTS = NetworkManager
-diff -urN NetworkManager-0.7.2/initscript/PLD/NetworkManager.in NetworkManager-0.7.2.new/initscript/PLD/NetworkManager.in
---- NetworkManager-0.7.2/initscript/PLD/NetworkManager.in      1970-01-01 01:00:00.000000000 +0100
-+++ NetworkManager-0.7.2.new/initscript/PLD/NetworkManager.in  2009-11-26 22:07:27.482742169 +0100
+diff -urN NetworkManager-0.8.2/initscript/PLD/NetworkManager.in NetworkManager-0.8.2.new//initscript/PLD/NetworkManager.in
+--- NetworkManager-0.8.2/initscript/PLD/NetworkManager.in      1970-01-01 01:00:00.000000000 +0100
++++ NetworkManager-0.8.2.new//initscript/PLD/NetworkManager.in 2010-11-04 21:54:27.000000000 +0100
 @@ -0,0 +1,74 @@
 +#!/bin/sh
 +#
@@ -149,22 +145,23 @@ diff -urN NetworkManager-0.7.2/initscript/PLD/NetworkManager.in NetworkManager-0
 +esac
 +              
 +exit $RETVAL
---- NetworkManager-0.8.0.998/src/backends/Makefile.am  2010-05-22 18:35:03.000000000 +0000
-+++ NetworkManager-0.8.0.998/src/backends/Makefile.am  2010-05-30 14:21:03.000000000 +0000
-@@ -14,6 +14,10 @@
- 
- libnmbackend_la_LIBADD =
+diff -urN NetworkManager-0.8.2/src/backends/Makefile.am NetworkManager-0.8.2.new//src/backends/Makefile.am
+--- NetworkManager-0.8.2/src/backends/Makefile.am      2010-10-19 01:44:05.000000000 +0200
++++ NetworkManager-0.8.2.new//src/backends/Makefile.am 2010-11-04 23:10:33.174111428 +0100
+@@ -57,6 +57,10 @@
+ libnmbackend_la_SOURCES += NetworkManagerLinexa.c
+ endif
  
 +if TARGET_PLD
 +libnmbackend_la_SOURCES += NetworkManagerPLD.c
 +endif
 +
- if TARGET_REDHAT
- libnmbackend_la_SOURCES += NetworkManagerRedHat.c
- endif
-diff -urN NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c
---- NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c      1970-01-01 01:00:00.000000000 +0100
-+++ NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c  2009-11-26 22:10:12.232724504 +0100
+ libnmbackend_la_LIBADD += \
+       $(top_builddir)/src/logging/libnm-logging.la \
+       $(DBUS_LIBS) \
+diff -urN NetworkManager-0.8.2/src/backends/NetworkManagerPLD.c NetworkManager-0.8.2.new//src/backends/NetworkManagerPLD.c
+--- NetworkManager-0.8.2/src/backends/NetworkManagerPLD.c      1970-01-01 01:00:00.000000000 +0100
++++ NetworkManager-0.8.2.new//src/backends/NetworkManagerPLD.c 2010-11-04 21:54:27.000000000 +0100
 @@ -0,0 +1,62 @@
 +/* NetworkManager -- Network link manager
 + *
@@ -228,3 +225,16 @@ diff -urN NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c NetworkManager-0
 +      }
 +}
 +
+diff -urN NetworkManager-0.8.2/system-settings/plugins/Makefile.am NetworkManager-0.8.2.new//system-settings/plugins/Makefile.am
+--- NetworkManager-0.8.2/system-settings/plugins/Makefile.am   2010-10-07 21:09:52.000000000 +0200
++++ NetworkManager-0.8.2.new//system-settings/plugins/Makefile.am      2010-11-04 23:12:52.904111428 +0100
+@@ -1,5 +1,9 @@
+ SUBDIRS=keyfile
+ 
++if TARGET_PLD
++SUBDIRS+=ifcfg-rh
++endif
++
+ if TARGET_REDHAT
+ SUBDIRS+=ifcfg-rh
+ endif
Network Manager for GNOME
This page took 0.244005 seconds and 4 git commands to generate.