Author: glen                         Date: Sun Jul 18 16:26:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- kernel part (still disabled as module included in 2.6.34)

---- Files affected:
packages/ipheth:
   ipheth.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ipheth/ipheth.spec
diff -u packages/ipheth/ipheth.spec:1.1 packages/ipheth/ipheth.spec:1.2
--- packages/ipheth/ipheth.spec:1.1     Sun Jul 18 17:14:53 2010
+++ packages/ipheth/ipheth.spec Sun Jul 18 18:26:26 2010
@@ -2,15 +2,28 @@
 #
 # Conditional build:
 %bcond_without dist_kernel     # allow non-distribution kernel
-%bcond_with            kernel          # don't build kernel modules
+%bcond_with    kernel          # don't build kernel modules
 %bcond_without userspace       # don't build userspace programs
 %bcond_with    verbose         # verbose build (V=1)
 
+%if %{without kernel}
+%undefine      with_dist_kernel
+%endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine      with_userspace
+%endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define                _enable_debug_packages  0
+%endif
+
+%define                rel     1
+%define                pname   ipheth
 Summary:       iPhone USB Ethernet Driver
-Name:          ipheth
+Name:       %{pname}%{_alt_kernel}
 Version:       0.1
-Release:       0.1
-License:       GPL v2
+Release:       %{rel}
+License:       BSD/GPL v2
 Group:         X11/Applications
 Source0:       %{name}.tar.bz2
 # Source0-md5: 0cc73e6033025c8ba8c5ef0090a631b1
@@ -24,10 +37,26 @@
 through USB cables. Unlike other solutions out there, you don't need
 to jailbreak your phone or install third-party proxy applications.
 
+%package -n kernel%{_alt_kernel}-net-ipheth
+Summary:       Linux driver for iPhone USB Ethernet Driver
+Release:       %{r...@%{_kernel_ver_str}
+Group:         Base/Kernel
+Requires(post,postun): /sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun):      %releq_kernel
+%endif
+
+%description -n kernel%{_alt_kernel}-net-ipheth
+Linux driver for iPhone USB Ethernet Driver.
+
 %prep
 %setup -q -n %{name}
 
 %build
+%if %{with kernel}
+%build_kernel_modules -C ipheth-driver -m ipheth 
CONFIG_DEBUG_SECTION_MISMATCH=y
+%endif
 %if %{with userspace}
 %{__make} -C ipheth-pair \
        CC="%{__cc}" \
@@ -36,6 +65,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%if %{with kernel}
+%install_kernel_modules -m ipheth-driver/ipheth -d misc
+%endif
+
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{/lib/udev,/etc/udev/rules.d}
 install -p ipheth-pair/ipheth-pair $RPM_BUILD_ROOT/lib/udev
@@ -45,17 +78,31 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -n kernel%{_alt_kernel}-net-ipheth
+%depmod %{_kernel_ver}
+
+%postun        -n kernel%{_alt_kernel}-net-ipheth
+%depmod %{_kernel_ver}
+
 %files
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) 
/etc/udev/rules.d/90-iphone-tether.rules
 %attr(755,root,root) /lib/udev/ipheth-pair
 
+%if %{with kernel}
+%files -n kernel%{_alt_kernel}-net-ipheth
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[email protected]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.1  2010/07/18 15:14:53  glen
-- new, just userspace
+Revision 1.2  2010/07/18 16:26:26  glen
+- kernel part (still disabled as module included in 2.6.34)
 
+Revision 1.1  2010/07/18 15:14:53  glen
+- new, just userspace
\ No newline at end of file
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipheth/ipheth.spec?r1=1.1&r2=1.2&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to