Hello community,

here is the log from the commit of package ndiswrapper for openSUSE:Factory
checked in at Wed Sep 21 17:12:45 CEST 2011.



--------
--- ndiswrapper/ndiswrapper.changes     2011-05-27 16:26:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/ndiswrapper/ndiswrapper.changes        
2011-09-21 13:53:38.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 21 11:52:25 UTC 2011 - [email protected]
+
+- Add ndiswrapper-3.0.patch
+  * HAVE_NETDEV_PRIV is gone in kernel 3.0 and netdev_priv is in
+    kernel since 2.6.6
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  ndiswrapper-3.0.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ndiswrapper.spec ++++++
--- /var/tmp/diff_new_pack.HlPAqX/_old  2011-09-21 17:12:41.000000000 +0200
+++ /var/tmp/diff_new_pack.HlPAqX/_new  2011-09-21 17:12:41.000000000 +0200
@@ -15,26 +15,27 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           ndiswrapper
-BuildRequires:  kernel-source kernel-syms module-init-tools
-Group:          System/Kernel
-AutoReqProv:    on
-Summary:        Use Microsoft NDIS Network Drivers for WLAN Cards
 Version:        1.56
 Release:        3
-Requires:       pciutils
-Requires:       ndiswrapper-kmp
-Source0:        %name-%version.tar.bz2
+License:        GPLv2+
+Summary:        Use Microsoft NDIS Network Drivers for WLAN Cards
+Url:            http://ndiswrapper.sourceforge.net
+Group:          System/Kernel
+Source0:        %{name}-%{version}.tar.bz2
 Source2:        README.SUSE
 Source3:        preamble
 Patch0:         ndiswrapper.diff
 Patch1:         ndiswrapper-2.6.35.patch
 Patch2:         ndiswrapper-2.6.38.patch
-Url:            http://ndiswrapper.sourceforge.net
-License:        GPLv2+
+Patch3:         ndiswrapper-3.0.patch
+BuildRequires:  kernel-source
+BuildRequires:  kernel-syms
+BuildRequires:  module-init-tools
+Requires:       ndiswrapper-kmp
+Requires:       pciutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64
 %suse_kernel_module_package -p %_sourcedir/preamble kdump um debug xen
@@ -48,8 +49,8 @@
 
 %package KMP
 License:        GPLv2+
-Group:          System/Kernel
 Summary:        Use Microsoft NDIS Network Drivers for WLAN Cards
+Group:          System/Kernel
 
 %description KMP
 Some wireless LAN vendors refuse to release hardware specifications or
@@ -59,16 +60,17 @@
 NDIS (Windows network driver API) drivers.
 
 %prep
-%setup
+%setup -q
 %patch0
 %patch1
 %patch2 -p2
-cp %SOURCE2 .
+%patch3
+cp %{SOURCE2} .
 mkdir obj
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" make -C utils
-export EXTRA_CFLAGS='-DVERSION=\"%version\"'
+CFLAGS="%{optflags}" make -C utils
+export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
 mkdir -p obj
 for flavor in %flavors_to_build; do
   rm -rf obj/$flavor
@@ -78,13 +80,13 @@
 done
 
 %install
-install -d -m 755 %buildroot/sbin %buildroot/usr/sbin \
-    %buildroot/etc/ndiswrapper
+install -d -m 755 %{buildroot}/sbin %{buildroot}%{_sbindir} \
+    %{buildroot}%{_sysconfdir}/ndiswrapper
 # Userspace stuff
-install -m 755 utils/loadndisdriver %buildroot/sbin
-install -m 755 utils/ndiswrapper %buildroot/usr/sbin
+install -m 755 utils/loadndisdriver %{buildroot}/sbin
+install -m 755 utils/ndiswrapper %{buildroot}%{_prefix}/sbin
 # Kernel module
-export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
+export INSTALL_MOD_PATH=%{buildroot}
 export INSTALL_MOD_DIR=updates
 for flavor in %flavors_to_build; do
      make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \
@@ -93,13 +95,9 @@
 
 %files
 %defattr(-, root, root)
-/etc/ndiswrapper
+%{_sysconfdir}/ndiswrapper
 /sbin/loadndisdriver
-/usr/sbin/ndiswrapper
-%doc README
-%doc README.SUSE
-%doc INSTALL
-%doc AUTHORS
-%doc ChangeLog
+%{_sbindir}/ndiswrapper
+%doc README README.SUSE AUTHORS ChangeLog
 
 %changelog

++++++ ndiswrapper-3.0.patch ++++++
--- driver/ntoskernel.h 2010-02-11 03:09:32.000000000 +0100
+++ driver/ntoskernel.h 2011-09-21 13:37:25.529535058 +0200
@@ -275,7 +275,7 @@
 #define PM_EVENT_SUSPEND 2
 #endif
 
-#if !defined(HAVE_NETDEV_PRIV)
+#if !defined(HAVE_NETDEV_PRIV) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
 #define netdev_priv(dev)  ((dev)->priv)
 #endif
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to