rpms/rp-pppoe/devel rp-pppoe.spec,1.36,1.37

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Jun 10 10:46:54 UTC 2006


Author: than

Update of /cvs/dist/rpms/rp-pppoe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25766

Modified Files:
	rp-pppoe.spec 
Log Message:
fix build problem in mock




Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/dist/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rp-pppoe.spec	15 Feb 2006 20:43:19 -0000	1.36
+++ rp-pppoe.spec	10 Jun 2006 10:46:51 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.5
-Release: 31
+Release: 32
 License: GPL
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -18,8 +18,6 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Prefix: %{_prefix}
-
 Prereq: /sbin/chkconfig
 Prereq: /sbin/service
 Prereq: fileutils
@@ -29,6 +27,11 @@
 Requires: iproute >= 2.6
 Requires: mktemp
 
+BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: coreutils
+
 ExcludeArch: s390 s390x
 
 %description
@@ -57,30 +60,30 @@
 install -m 0755 %{SOURCE5} scripts
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT/sbin
-make -C src install RPM_INSTALL_ROOT=$RPM_BUILD_ROOT 
+mkdir -p %{buildroot}/sbin
+make -C src install RPM_INSTALL_ROOT=%{buildroot}
 
-mv $RPM_BUILD_ROOT%{_sbindir}/* $RPM_BUILD_ROOT/sbin
+mv %{buildroot}%{_sbindir}/* %{buildroot}/sbin
 
-install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/sbin
-install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/sbin
-install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/sbin
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/sbin
+install -m 0755 %{SOURCE1} %{buildroot}/sbin
+install -m 0755 %{SOURCE2} %{buildroot}/sbin
+install -m 0755 %{SOURCE3} %{buildroot}/sbin
+install -m 0755 %{SOURCE4} %{buildroot}/sbin
+install -m 0755 %{SOURCE5} %{buildroot}/sbin
 
-pushd $RPM_BUILD_ROOT%{_sbindir}
+pushd %{buildroot}%{_sbindir}
 ln -s ../../sbin/* .
 popd
 
-rm -rf $RPM_BUILD_ROOT/etc/ppp/pppoe.conf \
-       $RPM_BUILD_ROOT/etc/rc.d/init.d/pppoe \
-       $RPM_BUILD_ROOT/usr/doc \
-       $RPM_BUILD_ROOT%{_sysconfdir}/ppp/plugins
+rm -rf %{buildroot}/etc/ppp/pppoe.conf \
+       %{buildroot}/etc/rc.d/init.d/pppoe \
+       %{buildroot}/usr/doc \
+       %{buildroot}%{_sysconfdir}/ppp/plugins
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %triggerpostun -- rp-pppoe < 3.2-1
 if [ -f /etc/rc.d/init.d/pppoe ]; then
@@ -151,6 +154,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5-32
+- fix build problem in mock
+
 * Wed Feb 15 2006 Than Ngo <than at redhat.com> 3.5-31
 - apply patch to use mktemp
 




More information about the fedora-cvs-commits mailing list