Author: glen Date: Mon Jun 18 19:12:34 2012 GMT Module: packages Tag: HEAD ---- Log message: - use unversioned ppp dir
---- Files affected: packages/capi4k-utils: capi4k-utils.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: packages/capi4k-utils/capi4k-utils.spec diff -u packages/capi4k-utils/capi4k-utils.spec:1.23 packages/capi4k-utils/capi4k-utils.spec:1.24 --- packages/capi4k-utils/capi4k-utils.spec:1.23 Sat Feb 19 22:56:27 2011 +++ packages/capi4k-utils/capi4k-utils.spec Mon Jun 18 21:12:29 2012 @@ -1,5 +1,6 @@ # $Revision$, $Date$ - +# +# Conditional build: %bcond_with capifax # capifax has some error and won't build right now Summary: CAPI 2.0 libraries and configuration tools @@ -7,7 +8,7 @@ Summary(pl.UTF-8): Biblioteki i narzędzia konfiguracyjne CAPI 2.0 Name: capi4k-utils Version: 2005.07.18 -Release: 3 +Release: 4 License: GPL Group: Applications/Communications Source0: ftp://ftp.in-berlin.de/pub/capi4linux/%{name}-2005-07-18.tar.gz @@ -140,17 +141,17 @@ UWAGA: To jest na razie BETA. Tylko do testów. %package -n ppp-plugin-capi -Summary: capiplugin for pppd-%{ppp_ver} -Summary(pl.UTF-8): Wtyczka capi dla pppd w wersji %{ppp_ver} +Summary: capiplugin for pppd +Summary(pl.UTF-8): Wtyczka capi dla pppd Group: Applications/Communications Requires: %{name} = %{version}-%{release} -Requires: ppp = 3:%{ppp_ver} +Requires: ppp %description -n ppp-plugin-capi -capiplugin for pppd-%{ppp_ver}. +capiplugin for pppd. %description -n ppp-plugin-capi -l pl.UTF-8 -Wtyczka capi dla pppd w wersji %{ppp_ver}. +Wtyczka capi dla pppd. %prep %setup -q -n %{name} @@ -178,8 +179,11 @@ install -p %{SOURCE1} . %build -%{__make} subconfig +%{__make} subconfig \ + CC="%{__cc}" + %{__make} \ + CC="%{__cc}" PPPVERSIONS=%{ppp_ver} %install @@ -189,6 +193,8 @@ PPPVERSIONS=%{ppp_ver} \ DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_libdir}/pppd/{%{ppp_ver},plugins} + # Firmware goes here - see LSB and kernel 2.6.x ISDN stuff install -d $RPM_BUILD_ROOT%{_datadir}/isdn @@ -256,7 +262,7 @@ %defattr(644,root,root,755) %exclude %{_sysconfdir}/drdsl %exclude %{_sysconfdir}/ppp -%{_libdir}/pppd/%{ppp_ver}/* +%{_libdir}/pppd/plugins/* %{_mandir}/man8/capiplugin.8* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -265,6 +271,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.24 2012/06/18 19:12:29 glen +- use unversioned ppp dir + Revision 1.23 2011/02/19 21:56:27 evil - updated amd64.patch - added include/msg2str_safety/ppd244/ppd245/rcapid patches from gentoo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/capi4k-utils/capi4k-utils.spec?r1=1.23&r2=1.24 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
