* Thu Aug 05 2010 Jiri Skala <jskala@redhat.com> - 2.4.5-11
- fixes #617625 - FTBFS in ppp due to change in kernel-headers - fixes pppol2tp Makefile
This commit is contained in:
parent
841e85a899
commit
3f274f3c3a
@ -74,3 +74,16 @@
|
|||||||
#else /* __STDC__ */
|
#else /* __STDC__ */
|
||||||
#define _PATH_PLUGIN "/usr/lib/pppd"
|
#define _PATH_PLUGIN "/usr/lib/pppd"
|
||||||
#endif /* __STDC__ */
|
#endif /* __STDC__ */
|
||||||
|
--- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux.lib64 2009-11-16 23:26:07.000000000 +0100
|
||||||
|
+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2010-08-05 16:33:53.964898629 +0200
|
||||||
|
@@ -6,8 +6,8 @@
|
||||||
|
|
||||||
|
#***********************************************************************
|
||||||
|
|
||||||
|
-DESTDIR = @DESTDIR@
|
||||||
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
||||||
|
+DESTDIR = $(INSTROOT)@DESTDIR@
|
||||||
|
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
|
||||||
|
|
||||||
|
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
||||||
|
|
||||||
|
8
ppp.spec
8
ppp.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: The Point-to-Point Protocol daemon
|
Summary: The Point-to-Point Protocol daemon
|
||||||
Name: ppp
|
Name: ppp
|
||||||
Version: 2.4.5
|
Version: 2.4.5
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
URL: http://www.samba.org/ppp
|
URL: http://www.samba.org/ppp
|
||||||
@ -78,6 +78,8 @@ rm -f scripts/*.usepeerdns-var_run_ppp_resolv
|
|||||||
rm -f scripts/*.ppp_resolv
|
rm -f scripts/*.ppp_resolv
|
||||||
find . -type f -name "*.sample" | xargs rm -f
|
find . -type f -name "*.sample" | xargs rm -f
|
||||||
|
|
||||||
|
rm -f include/linux/if_pppol2tp.h
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#find . -name 'Makefile*' -print0 | xargs -0 perl -pi.no_strip -e "s: -s : :g"
|
#find . -name 'Makefile*' -print0 | xargs -0 perl -pi.no_strip -e "s: -s : :g"
|
||||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall"
|
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall"
|
||||||
@ -139,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc PLUGINS
|
%doc PLUGINS
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 05 2010 Jiri Skala <jskala@redhat.com> - 2.4.5-11
|
||||||
|
- fixes #617625 - FTBFS in ppp due to change in kernel-headers
|
||||||
|
- fixes pppol2tp Makefile
|
||||||
|
|
||||||
* Tue Jul 13 2010 Jiri Skala <jskala@redhat.com> - 2.4.5-10
|
* Tue Jul 13 2010 Jiri Skala <jskala@redhat.com> - 2.4.5-10
|
||||||
- fixes #613717 - Missing line in example script ip-up.local.add
|
- fixes #613717 - Missing line in example script ip-up.local.add
|
||||||
- removed /usr/kerberos/include from eaptls patch
|
- removed /usr/kerberos/include from eaptls patch
|
||||||
|
Loading…
Reference in New Issue
Block a user