Author: pluto Date: Fri Jul 22 06:37:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - bcond fixed, userspace build fixed.
---- Files affected: SPECS: rt2500.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/rt2500.spec diff -u SPECS/rt2500.spec:1.6 SPECS/rt2500.spec:1.7 --- SPECS/rt2500.spec:1.6 Sat May 21 17:06:28 2005 +++ SPECS/rt2500.spec Fri Jul 22 08:37:46 2005 @@ -4,7 +4,7 @@ %bcond_without dist_kernel # allow non-distribution kernel %bcond_without kernel # don't build kernel modules %bcond_without smp # don't build SMP module -%bcond_with userspace # don't build userspace module +%bcond_without userspace # don't build userspace module %bcond_with verbose # verbose build (V=1) # Summary: Linux driver for WLAN cards based on RT2500 @@ -19,14 +19,16 @@ # Source0: http://www.minitar.com/downloads/rt2500_linux-%{version}-b1.tgz Source0: http://rt2x00.serialmonkey.com/%{name}-%{version}-%{_subver}.tar.gz # Source0-md5: 8846a055cd05bf71af96645637e5a2d1 +Patch0: %{name}-qt.patch URL: http://rt2x00.serialmonkey.com/ %if %{with kernel} %{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} -BuildRequires: rpmbuild(macros) >= 1.153 +BuildRequires: rpmbuild(macros) >= 1.217 %endif %if %{with userspace} BuildRequires: XFree86-devel BuildRequires: pkgconfig +BuildRequires: qmake BuildRequires: qt-devel >= 3.1.1 %endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -43,9 +45,11 @@ Summary(pl): Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie RT2500 Release: [EMAIL PROTECTED] Group: Base/Kernel -%{?with_dist_kernel:%requires_releq_kernel_up} Requires(post,postun): /sbin/depmod -%{?with_dist_kernel:Requires(postun): kernel} +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif %description -n kernel-net-rt2500 This is a Linux driver for WLAN cards based on RT2500. @@ -63,9 +67,11 @@ Summary(pl): Sterownik dla Linuksa SMP do kart bezprzewodowych opartych na układzie RT2500 Release: [EMAIL PROTECTED] Group: Base/Kernel -%{?with_dist_kernel:%requires_releq_kernel_smp} Requires(post,postun): /sbin/depmod -%{?with_dist_kernel:Requires(postun): kernel-smp} +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif %description -n kernel-smp-net-rt2500 This is a Linux driver for WLAN cards based on RT2500. @@ -80,11 +86,12 @@ %prep %setup -q - -%{__perl} -pi -e 's@/lib@/[EMAIL PROTECTED]' Utilitys/Makefile +%patch0 -p1 %build %if %{with userspace} +qmake -unix Utilitys/raconfig2500.pro -o Utilitys/Makefile + %{__make} -C Utilitys \ CXXFLAGS="%{rpmcflags} %(pkg-config qt-mt --cflags)" \ LDFLAGS="%{rpmldflags}" \ @@ -120,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} -install -D Utilitys/RaConfig $RPM_BUILD_ROOT%{_bindir}/RaConfig +install -D Utilitys/RaConfig2500 $RPM_BUILD_ROOT%{_bindir}/RaConfig2500 %endif %if %{with kernel} @@ -154,7 +161,7 @@ %files %defattr(644,root,root,755) %doc CHANGELOG FAQ -%attr(755,root,root) %{_bindir}/RaConfig +%attr(755,root,root) %{_bindir}/RaConfig2500 %endif %if %{with kernel} @@ -175,6 +182,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2005/07/22 06:37:46 pluto +- bcond fixed, userspace build fixed. + Revision 1.6 2005/05/21 15:06:28 averne - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rt2500.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
