Author: glen Date: Mon May 5 20:23:41 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - /etc/tcprules.d moved here from daemontools (why it was there anyway?) - cleanup build proccess; rel 7
---- Files affected: SPECS: ucspi-tcp.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/ucspi-tcp.spec diff -u SPECS/ucspi-tcp.spec:1.27 SPECS/ucspi-tcp.spec:1.28 --- SPECS/ucspi-tcp.spec:1.27 Sun Apr 27 12:03:26 2008 +++ SPECS/ucspi-tcp.spec Mon May 5 22:23:36 2008 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): Superserwer Transport Control Protocol Name: ucspi-tcp Version: 0.88 -Release: 6 +Release: 7 Group: Networking/Daemons # http://cr.yp.to/distributors.html License: Public Domain @@ -15,13 +15,21 @@ # Source0-md5: 39b619147db54687c4a583a7a94c9163 Source1: ftp://ftp.innominate.org/pub/pape/djb/%{name}-%{version}-man.tar.gz # Source1-md5: 693be34da89cd5244cef8ae30b4dc6a4 +Source2: daemontools-tcprules Patch0: %{name}-%{version}-mysql.patch.pld Patch1: %{name}-glibc.patch Patch2: http://lamer.maexotic.de/maex/creative/software/ucspi-tcp/0.88-recordio/recordio.diff URL: http://cr.yp.to/ucspi-tcp.html %{?with_mysql:BuildRequires: mysql-devel} +# make and stat from coreutils are for building tcprules +Requires: coreutils +Requires: make +Conflicts: daemontools < 0.76-8 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +# qmail.spec uses this dir +%define tcprules /etc/tcprules.d + %description UNIX Client/Server Program Interface - something like inetd with add-ons. @@ -31,53 +39,39 @@ inetd z małymi dodatkami. %prep -%setup -q +%setup -q -a1 +mv ucspi-tcp-%{version}-man man %{?with_mysql:%patch0} -%patch1 +%patch1 -p0 %patch2 -p1 -echo '%{__cc} %{rpmcflags} -I%{_includedir}/mysql' > conf-cc -echo %{_prefix} > conf-home %build +echo "%{__cc} %{rpmcflags} %{?with_mysql:-I%{_includedir}/mysql}" > conf-cc +echo "%{_prefix}" > conf-home %{__make} %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man{1,3,5},%{tcprules}} -tar zxf %{SOURCE1} - -install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man{1,3,5}} +install addcr argv0 auto-str date@ delcr finger@ fixcrio \ + http@ mconnect mconnect-io rblsmtpd recordio rts tcpcat \ + tcpclient tcprules tcprulescheck tcpserver who@ \ + $RPM_BUILD_ROOT%{_bindir} -install addcr $RPM_BUILD_ROOT%{_bindir} -install argv0 $RPM_BUILD_ROOT%{_bindir} -install auto-str $RPM_BUILD_ROOT%{_bindir} -install date@ $RPM_BUILD_ROOT%{_bindir} -install delcr $RPM_BUILD_ROOT%{_bindir} -install finger@ $RPM_BUILD_ROOT%{_bindir} -install fixcrio $RPM_BUILD_ROOT%{_bindir} -install http@ $RPM_BUILD_ROOT%{_bindir} -install mconnect $RPM_BUILD_ROOT%{_bindir} -install mconnect-io $RPM_BUILD_ROOT%{_bindir} -install rblsmtpd $RPM_BUILD_ROOT%{_bindir} -install recordio $RPM_BUILD_ROOT%{_bindir} -install rts $RPM_BUILD_ROOT%{_bindir} -install tcpcat $RPM_BUILD_ROOT%{_bindir} -install tcpclient $RPM_BUILD_ROOT%{_bindir} -install tcprules $RPM_BUILD_ROOT%{_bindir} -install tcprulescheck $RPM_BUILD_ROOT%{_bindir} -install tcpserver $RPM_BUILD_ROOT%{_bindir} -install who@ $RPM_BUILD_ROOT%{_bindir} +install man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install ./%{name}-%{version}-man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install %{SOURCE2} $RPM_BUILD_ROOT%{tcprules}/Makefile %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc {CHANGES,README,SYSDEPS,TARGETS,TODO,VERSION} -%{_mandir}/man1/* +%doc CHANGES README SYSDEPS TARGETS TODO VERSION +%{tcprules} %attr(755,root,root) %{_bindir}/* +%{_mandir}/man1/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -85,6 +79,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2008-05-05 20:23:36 glen +- /etc/tcprules.d moved here from daemontools (why it was there anyway?) +- cleanup build proccess; rel 7 + Revision 1.27 2008-04-27 10:03:26 qboosh - ucspi-tcp 0.88 is Public Domain since 20071228 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ucspi-tcp.spec?r1=1.27&r2=1.28&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
