File project.diff of Package proxy-suite
--- proxy-suite.changes.orig
+++ proxy-suite.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Jul 22 14:42:02 CEST 2009 - mt@suse.de
+
+- Test build of proxy-suite-1.9.3.0
+
+-------------------------------------------------------------------
Wed Mar 11 18:29:47 CET 2009 - mt@suse.de
- Fixed init script LSB info tags adding a $time dependency
--- proxy-suite.spec.orig
+++ proxy-suite.spec
@@ -1,5 +1,5 @@
#
-# spec file for package proxy-suite (Version 1.9.2.4)
+# spec file for package proxy-suite (Version 1.9.3.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,22 +17,15 @@ BuildRequires: awk ctags openldap2-deve
Summary: The SuSE Proxy Suite - FTP-Proxy
Group: Productivity/Networking/Web/Proxy
License: GPL v2 or later
-Version: 1.9.2.4
-Release: 144
+Version: 1.9.3.0
+Release: 0
Requires: openldap2-client
Provides: ftp-proxy fwproxy
Obsoletes: fwproxy
AutoReqProv: on
Url: http://proxy-suite.suse.de/
Source0: ftp://ftp.suse.com/pub/projects/proxy-suite/src/proxy-suite-%{version}.tar.bz2
-Source1: ftp://ftp.suse.com/pub/projects/proxy-suite/src/proxy-suite-%{version}.tar.bz2.asc
-Patch0: proxy-suite-suse8x.dif
-Patch1: proxy-suite-%{version}-socklen.dif
-Patch2: proxy-suite-%{version}-warnings.dif
-Patch3: proxy-suite-%{version}-no-strip.dif
-Patch4: proxy-suite-%{version}-includes.dif
-Patch5: proxy-suite-%{version}-lsb-info.dif
-Patch6: proxy-suite-%{version}-lsb-network-remotefs.dif
+#Source1: ftp://ftp.suse.com/pub/projects/proxy-suite/src/proxy-suite-%{version}.tar.bz2.asc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
@@ -51,50 +44,57 @@ Authors:
Pieter Hollants <pieter.hollants@suse.de>
Marius Tomaschewski <mt@suse.de>
+%debug_package
%prep
%setup -n proxy-suite-%{version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%if %{?suse_version:%suse_version}%{?!suse_version:0} >= 1110
-%patch6
-%endif
%build
%{?suse_update_config:%{suse_update_config}}
-CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
+CFLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e "s/-O[0-9]*/-O0 -g/g")
%if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
CFLAGS="${CFLAGS} -fpie"
LDFLAGS="-pie"
%endif
-autoreconf
+autoreconf --install --verbose
export CFLAGS LDFLAGS
-./configure --prefix=/usr --mandir=%{_mandir} \
- --sysconfdir=/etc --localstatedir=/var/run \
- --enable-so-linger --enable-warnings \
- --with-regex --with-libwrap --with-libldap
-make
+#
+%configure --docdir=%{_defaultdocdir}/%{name} \
+%if 0%{?_with_debug:1}
+ --enable-debug \
+%endif
+%if 0%{?_with_docs:1}
+ --enable-docs \
+%endif
+ --enable-so-linger \
+ --enable-warnings \
+ --with-regex \
+ --with-libwrap \
+ --with-libldap
+#
+make %_smp_mflags
%install
export RPM_BUILD_ROOT
export RPM_SOURCE_DIR
-install -d $RPM_BUILD_ROOT/usr/sbin
-install -d $RPM_BUILD_ROOT/etc/init.d
-install -m750 -d $RPM_BUILD_ROOT/var/lib/ftp-proxy/rundir
-INST_ROOT=$RPM_BUILD_ROOT make install
-install -m755 ftp-proxy/rc.script $RPM_BUILD_ROOT/etc/init.d/ftp-proxy
-ln -sf ../../etc/init.d/ftp-proxy $RPM_BUILD_ROOT/usr/sbin/rcftp-proxy
-mkdir -p ftp/html
-cp ftp-proxy/{NEWS,FAQ,TODO,SYSLOG,*.txt} ftp/
-cp doc/*.pdf ftp/
-cp doc/*.html ftp/html/
-awk '/^# \$Log:/ { a=1; }
- /^#$|^#[^#]/ { if(a) {gsub("^#[ ]?", ""); print $0; }}' \
- < changelog > changelog.txt
-
+install -d -m755 $RPM_BUILD_ROOT%{_sbindir}
+install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -d -m755 $RPM_BUILD_ROOT%{_localstatedir}/lib/proxy-suite/ftp
+install -d -m755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ftp-proxy
+#
+DESTDIR=$RPM_BUILD_ROOT make install
+#
+install -m755 ftp-proxy/rc.script \
+ $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ftp-proxy
+ln -sf %{_sysconfdir}/init.d/ftp-proxy \
+ $RPM_BUILD_ROOT%{_sbindir}/rcftp-proxy
+install -m644 AUTHORS COPYING CREDITS INSTALL ChangeLog \
+ $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
+install -m644 ftp-proxy/{FAQ,NEWS,TODO,SYSLOG,*.txt,*.conf} \
+ $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ftp-proxy/
+find doc -type f -name "*.pdf" -exec \
+ install -m644 \{\} $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ftp-proxy/ \;
+find doc -type f -name "*.html" -exec \
+ install -m644 \{\} $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ftp-proxy/ \;
%post
%{fillup_and_insserv ftp-proxy -i}
@@ -107,122 +107,15 @@ awk '/^# \$Log:/ { a=1; }
%files
%defattr(-,root,root)
-%doc ftp AUTHORS COPYING CREDITS INSTALL changelog.txt
-%config(noreplace) /etc/proxy-suite/ftp-proxy.conf
-%dir /etc/proxy-suite
-%dir /var/lib/ftp-proxy
-%dir /var/lib/ftp-proxy/rundir
+%doc %{_defaultdocdir}/%{name}
+%dir %{_sysconfdir}/proxy-suite
+%config(noreplace) %{_sysconfdir}/proxy-suite/ftp-proxy.conf
+%{_sysconfdir}/init.d/ftp-proxy
+%dir %{_localstatedir}/lib/proxy-suite
+%dir %{_localstatedir}/lib/proxy-suite/ftp
%{_mandir}/man5/ftp-proxy.conf.5*
%{_mandir}/man8/ftp-proxy.8*
-/etc/init.d/ftp-proxy
-/usr/sbin/ftp-proxy
-/usr/sbin/rcftp-proxy
+%{_sbindir}/ftp-proxy
+%{_sbindir}/rcftp-proxy
%changelog
-* Tue Apr 29 2008 mt@suse.de
-- Added the inclusion of header files providing linux types
- and int limits, before linux/netfilter_ipv4.h is included.
-- Added LSB short-description tag to the init script.
-- Added small patch fixing an always true warning.
-- Removed obsolete suse_version checks from spec file
-- Changed to install the changelog content from changelog
- script as changelog.txt and not the script itself.
-* Sat May 27 2006 schwab@suse.de
-- Don't strip binaries.
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Tue Oct 25 2005 rhafer@suse.de
-- added LDAP_DEPRECATED to CFLAGS to build correctly with
- OpenLDAP 2.3
-* Wed Jul 27 2005 mt@suse.de
-- Fixed to use socklen_t
-- Added -fpie -pie build flags
-* Tue Jan 11 2005 mt@suse.de
-- updated to proxy-suite-1.9.2.4
-* Mon Jan 10 2005 mt@suse.de
-- updated to proxy-suite-1.9.2.3
-* Tue Mar 30 2004 mt@suse.de
-- updated to latest bugfix release 1.9.2.2 replacing some hard
- coded user name checks with config option and default regex
-- removed obsolete patches (intergrated in the source tgz):
- proxy-suite-1.9.dif,proxy-suite-1.9-{paths,rundir}.dif
-* Sat Jan 10 2004 adrian@suse.de
-- build as user
-* Fri Jun 13 2003 kukuk@suse.de
-- Add missing directory to filelist
-* Fri Feb 28 2003 mt@suse.de
-- adopted init script paths: /usr/bin/logger -> /bin/logger, ...
- Thanx to Achim Frank for his report.
- new patch file: proxy-suite-1.9-paths.dif
-- removed packages needed only to rebuild docs from neededforbuild
-* Fri Feb 14 2003 ro@suse.de
-- /var/ftp-proxy/rundir -> /var/lib/ftp-proxy/rundir
-* Wed Jan 15 2003 ro@suse.de
-- use sasl2
-* Tue Nov 12 2002 ro@suse.de
-- changed neededforbuild <xshared> to <x-devel-packages>
-* Mon Nov 11 2002 ro@suse.de
-- changed neededforbuild <sp> to <opensp>
-- changed neededforbuild <sp-devel> to <>
-* Mon Aug 19 2002 mmj@suse.de
-- Correct PreReq
-* Fri Jul 19 2002 mt@suse.de
-- updated to proxy-suite-1.9
-* Fri Feb 01 2002 ro@suse.de
-- changed neededforbuild <libpng> to <libpng-devel-packages>
-* Tue Jan 29 2002 mt@suse.de
-- updated to 1.8.1, changed to use openldap2-client
-* Tue Jan 15 2002 egmont@suselinux.hu
-- removed colons from startup/shutdown messages
-* Mon Jan 14 2002 ro@suse.de
-- removed START_FTP_PROXY and adapt for similar change in syslog-ng
-* Wed Sep 19 2001 mt@suse.de
-- renamed proxy-suite-1.7.dif to proxy-suite-1.7<PATCHLEVEL>.dif
-- fixed sample run level script to be LSB compliant (I hope it is now)
-- added Solaris FIONREAD (broken pipe) patch from Stefan Landvoigt
-* Wed Aug 15 2001 mt@suse.de
-- added tcpd to neededforbuild
-* Mon Aug 13 2001 ro@suse.de
-- changed neededforbuild <sp_libs> to <sp-devel>
-* Fri Jul 20 2001 mt@suse.de
-- updated to 1.7tp7
-- added glib and gppshare to neededforbuild (needed by ghostscript)
-* Fri Jul 20 2001 kukuk@suse.de
-- changed neededforbuild <gs_fonts> to <ghostscript-fonts-std>
-- changed neededforbuild <gs_lib> to <ghostscript-library>
-- changed neededforbuild <gs_serv> to <ghostscript-serv>
-* Thu Jul 19 2001 schwab@suse.de
-- Add %%suse_update_config.
-* Tue Jun 05 2001 mt@suse.de
-- updated to 1.7tp6 (bugfix release)
-* Tue Jan 02 2001 olh@suse.de
-- use script name in %%post
-* Fri Dec 01 2000 mt@suse.de
-- added mkdir $RPM_BUILD_ROOT/sbin in spec
-* Fri Dec 01 2000 mt@suse.de
-- moved run-level scripts from sbin/init.d to etc/init.d
-* Thu Nov 30 2000 mt@suse.de
-- extended run-level script to support chroot env
-- written ftp-proxy-chroot.txt readme
-* Wed Nov 22 2000 mt@suse.de
-- changed to insserv installation of run level links (LSB)
-- added BuildRoot in spec file
-* Wed Nov 08 2000 mt@suse.de
-- added Obsoletes-Flag for fwproxy in spec file
-* Wed Nov 08 2000 mt@suse.de
-- updated to 1.7.tp5 with transparent proxying support
-- renamed package from fwproxy to proxy-suite
-* Mon Sep 18 2000 mt@suse.de
-- fixed daemon_cleanup
-* Tue Sep 12 2000 mt@suse.de
-- disabled RFC2428 extensions (are not implemented now)
-* Mon Jul 03 2000 mt@suse.de
-- stripped binary
-* Fri Jun 30 2000 mt@suse.de
-- updated to 1.7
-* Wed Mar 01 2000 uli@suse.de
-- moved man pages to /usr/share
-* Tue Feb 01 2000 ro@suse.de
-- call gnuctags instead of ctags
-* Mon Oct 04 1999 mt@suse.de
-- new version proxy-suite-1.5
