rpms/pptp/devel pptp.spec, 1.3, 1.4 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 pptp-cvs20050331.patch, 1.1, NONE

Paul Howarth (pghmcfc) fedora-extras-commits at redhat.com
Thu Jul 28 15:26:12 UTC 2005


Author: pghmcfc

Update of /cvs/extras/rpms/pptp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28418

Modified Files:
	pptp.spec sources .cvsignore 
Removed Files:
	pptp-cvs20050331.patch 
Log Message:
* Thu Jul 28 2005 Paul Howarth <paul at city-fan.org> 1.7.0-1
- new upstream version 1.7.0
- remove patch, included upstream
- edit Makefile to prevent attempted chown in %install
- remove redundant %attr tag in %files
- honour $RPM_OPT_FLAGS
- ensure directories have correct permissions



Index: pptp.spec
===================================================================
RCS file: /cvs/extras/rpms/pptp/devel/pptp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pptp.spec	27 May 2005 14:49:16 -0000	1.3
+++ pptp.spec	28 Jul 2005 15:26:10 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           pptp
-Version:        1.6.0
-Release:        5%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 Summary:        Point-to-Point Tunneling Protocol (PPTP) Client
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pptpclient.sourceforge.net/
 Source0:        http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz
-Patch0:		pptp-cvs20050331.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       ppp >= 2.4.2
@@ -19,10 +18,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile
 
 %build
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS"
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -32,26 +31,34 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root,0755)
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
 %doc ChangeLog Documentation/DESIGN.PPTP
-%attr(755,root,root) %{_sbindir}/pptp
+%{_sbindir}/pptp
 %{_mandir}/man8/pptp.8*
 # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the
 # Fedora Core ppp package hardcodes the directory name
 %config(noreplace) /etc/ppp/options.pptp
 
 %changelog
-* Fri May 27 2005 Paul Howarth <paul at city-fan.org> 1.6.0-5%{?dist}
+* Thu Jul 28 2005 Paul Howarth <paul at city-fan.org> 1.7.0-1
+- new upstream version 1.7.0
+- remove patch, included upstream
+- edit Makefile to prevent attempted chown in %%install
+- remove redundant %%attr tag in %%files
+- honour $RPM_OPT_FLAGS
+- ensure directories have correct permissions
+
+* Fri May 27 2005 Paul Howarth <paul at city-fan.org> 1.6.0-5
 - bump and rebuild
 
-* Tue May 17 2005 Paul Howarth <paul at city-fan.org> 1.6.0-4%{?dist}
+* Tue May 17 2005 Paul Howarth <paul at city-fan.org> 1.6.0-4
 - rebuild with dist tags
 
-* Tue May 10 2005 Paul Howarth <paul at city-fan.org> 1.6.0-3%{?dist}
+* Tue May 10 2005 Paul Howarth <paul at city-fan.org> 1.6.0-3
 - fix URL for SOURCE0 not to point to a specific sf.net mirror
 
-* Tue May 10 2005 Paul Howarth <paul at city-fan.org> 1.6.0-2%{?dist}
+* Tue May 10 2005 Paul Howarth <paul at city-fan.org> 1.6.0-2
 - Weed out documentation useful only to developers
 - Add dist tag
 - Use full URL for SOURCE0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pptp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 May 2005 14:29:42 -0000	1.2
+++ sources	28 Jul 2005 15:26:10 -0000	1.3
@@ -1 +1 @@
-9a706327fb9827541d7c86d48ceb9631  pptp-1.6.0.tar.gz
+0bc7dbd1c265e4263008fa7883de58dd  pptp-1.7.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pptp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 May 2005 14:29:42 -0000	1.2
+++ .cvsignore	28 Jul 2005 15:26:10 -0000	1.3
@@ -1 +1 @@
-pptp-1.6.0.tar.gz
+pptp-1.7.0.tar.gz


--- pptp-cvs20050331.patch DELETED ---




More information about the fedora-extras-commits mailing list