SPECS: fcron.spec, fedora-rpmdevtools.spec, fftw.spec, freeswan.sp...
ankry
ankry at pld-linux.org
Sat Aug 12 11:28:49 CEST 2006
Author: ankry Date: Sat Aug 12 09:28:49 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- formatting
---- Files affected:
SPECS:
fcron.spec (1.35 -> 1.36) , fedora-rpmdevtools.spec (1.4 -> 1.5) , fftw.spec (1.63 -> 1.64) , freeswan.spec (1.79 -> 1.80)
---- Diffs:
================================================================
Index: SPECS/fcron.spec
diff -u SPECS/fcron.spec:1.35 SPECS/fcron.spec:1.36
--- SPECS/fcron.spec:1.35 Fri Apr 14 16:40:34 2006
+++ SPECS/fcron.spec Sat Aug 12 11:28:43 2006
@@ -121,14 +121,14 @@
touch $RPM_BUILD_ROOT/var/log/cron
cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.allow << EOF
-# cron.allow This file describes the names of the users which are
-# allowed to use the local cron daemon
+# cron.allow This file describes the names of the users which are
+# allowed to use the local cron daemon
root
EOF
cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.deny << EOF2
-# cron.deny This file describes the names of the users which are
-# NOT allowed to use the local cron daemon
+# cron.deny This file describes the names of the users which are
+# NOT allowed to use the local cron daemon
EOF2
%clean
@@ -246,7 +246,7 @@
%files
%defattr(644,root,root,755)
-%doc doc/HTML doc/olddoc/{FAQ,CHANGES,README,THANKS,TODO}
+%doc doc/HTML doc/olddoc/{FAQ,CHANGES,README,THANKS,TODO}
%attr(750,root,crontab) %dir %{_sysconfdir}/cron*
%attr(750,root,root) %{_sysconfdir}/cron.hourly/%{name}.systab
%attr(640,root,crontab) %config(noreplace) /etc/cron.d/crontab
@@ -277,6 +277,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2006/08/12 09:28:43 ankry
+- formatting
+
Revision 1.35 2006/04/14 14:40:34 glen
- rel 3
================================================================
Index: SPECS/fedora-rpmdevtools.spec
diff -u SPECS/fedora-rpmdevtools.spec:1.4 SPECS/fedora-rpmdevtools.spec:1.5
--- SPECS/fedora-rpmdevtools.spec:1.4 Sat Mar 4 13:31:55 2006
+++ SPECS/fedora-rpmdevtools.spec Sat Aug 12 11:28:44 2006
@@ -1,7 +1,7 @@
# $Revision$, $Date$
-%define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version 1.0.7
+%define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d
+%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define spectool_version 1.0.7
Summary: Fedora RPM Development Tools
Summary(pl): Narzędzia do tworzenia RPM-ów Fedory
@@ -81,19 +81,19 @@
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-buildrpmtree $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-installdevkeys $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-kmodhelper $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-md5 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-newrpmspec $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rmdevelrpms $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rpmchecksig $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
-install -pm 755 fedora-extract $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-diffarchive $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rpmvercmp $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-wipebuildtree $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-buildrpmtree $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-installdevkeys $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-kmodhelper $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-md5 $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-newrpmspec $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-rmdevelrpms $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-rpmchecksig $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
+install -pm 755 fedora-extract $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-diffarchive $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-rpmvercmp $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 fedora-wipebuildtree $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm
install -pm 755 check-buildroot check-rpaths* \
@@ -126,11 +126,11 @@
%if 0
%triggerin -- emacs-common
[ -d %{emacs_sitestart_d} ] && \
- ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d} || :
+ ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d} || :
%triggerin -- xemacs-common
[ -d %{xemacs_sitestart_d} ] && \
- ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{xemacs_sitestart_d} || :
+ ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{xemacs_sitestart_d} || :
%triggerun -- emacs-common
[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.el* || :
@@ -157,6 +157,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2006/08/12 09:28:44 ankry
+- formatting
+
Revision 1.4 2006/03/04 12:31:55 qboosh
- pl, some cleanups
================================================================
Index: SPECS/fftw.spec
diff -u SPECS/fftw.spec:1.63 SPECS/fftw.spec:1.64
--- SPECS/fftw.spec:1.63 Tue Aug 8 16:38:10 2006
+++ SPECS/fftw.spec Sat Aug 12 11:28:44 2006
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
# Conditional build
-%bcond_without single # without single precision library
+%bcond_without single # without single precision library
#
Summary: Fast Fourier transform library
Summary(pl): Biblioteka z funkcjami szybkiej transformaty Fouriera
@@ -94,13 +94,13 @@
%if %{with single}
%configure \
%ifarch %{ix86}
- --enable-i386-hacks \
+ --enable-i386-hacks \
%endif
- --enable-shared \
- --enable-threads \
- --enable-float \
+ --enable-shared \
+ --enable-threads \
+ --enable-float \
--enable-type-prefix \
- --%{!?debug:dis}%{?debug:en}able-debug
+ --%{!?debug:dis}%{?debug:en}able-debug
%{__make}
%{__make} install \
@@ -158,6 +158,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.64 2006/08/12 09:28:44 ankry
+- formatting
+
Revision 1.63 2006/08/08 14:38:10 sparky
- mass attack: s/%patch /%patch0 / -- usefull for overloaded %patch macro
================================================================
Index: SPECS/freeswan.spec
diff -u SPECS/freeswan.spec:1.79 SPECS/freeswan.spec:1.80
--- SPECS/freeswan.spec:1.79 Thu Mar 9 15:35:10 2006
+++ SPECS/freeswan.spec Sat Aug 12 11:28:44 2006
@@ -12,7 +12,7 @@
Summary(pl): Publicznie dostępna implementacja IPSEC
Name: freeswan
Version: 2.04
-%define _rel 0.1
+%define _rel 0.1
Release: %{_rel}
License: GPL
Group: Networking/Daemons
@@ -99,33 +99,36 @@
%{?with_NAT:patch -p1 -s <NAT-Traversal-%{nat_tr_ver}/NAT-Traversal-%{nat_tr_ver}-freeswan-2.00-x509-1.3.5.diff}
%build
-%define _kver `echo "%{_kernel_ver}" |awk -F. '{print $2}'`
+%define _kver `echo "%{_kernel_ver}" |awk -F. '{print $2}'`
+
%if %{with modules}
- install -d kernelsrc
- lndir -silent %{_kernelsrcdir} kernelsrc
- mv kernelsrc/.config kernelsrc/.config.old
- cp kernelsrc/.config.old kernelsrc/.config
- %if %{with dist_kernel}
- rm -rf kernelsrc/include/asm
- cd kernelsrc
- patch -R -p1 <../linux/net/Makefile.fs2_%{_kver}.patch
- patch -R -p1 <../linux/net/Config.in.fs2_%{_kver}.patch
- patch -R -p1 <../linux/net/ipv4/af_inet.c.fs2_%{_kver}.patch
- patch -R -p1 <../linux/Documentation/Configure.help.fs2_%{_kver}.patch
- cd ..
- rm -rf kernelsrc/{crypto,include/{freeswan,zlib,crypto},lib/{zlib,libfreeswan},net/ipsec}
- rm kernelsrc/include/{freeswan,pfkey,pfkeyv2}.h
- cp kernelsrc/config-up kernelsrc/.config
- %endif
- echo "CONFIG_IPSEC=m" >> kernelsrc/.config
- echo "CONFIG_IPSEC_IPIP=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_AH=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_AUTH_HMAC_MD5=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_AUTH_HMAC_SHA1=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_ESP=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_ENC_3DES=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_IPCOMP=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_DEBUG=y" >> kernelsrc/.config
+install -d kernelsrc
+lndir -silent %{_kernelsrcdir} kernelsrc
+mv kernelsrc/.config kernelsrc/.config.old
+cp kernelsrc/.config.old kernelsrc/.config
+
+%if %{with dist_kernel}
+rm -rf kernelsrc/include/asm
+cd kernelsrc
+patch -R -p1 <../linux/net/Makefile.fs2_%{_kver}.patch
+patch -R -p1 <../linux/net/Config.in.fs2_%{_kver}.patch
+patch -R -p1 <../linux/net/ipv4/af_inet.c.fs2_%{_kver}.patch
+patch -R -p1 <../linux/Documentation/Configure.help.fs2_%{_kver}.patch
+cd ..
+rm -rf kernelsrc/{crypto,include/{freeswan,zlib,crypto},lib/{zlib,libfreeswan},net/ipsec}
+rm kernelsrc/include/{freeswan,pfkey,pfkeyv2}.h
+cp kernelsrc/config-up kernelsrc/.config
+%endif
+
+echo "CONFIG_IPSEC=m" >> kernelsrc/.config
+echo "CONFIG_IPSEC_IPIP=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_AH=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_AUTH_HMAC_MD5=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_AUTH_HMAC_SHA1=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_ESP=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_ENC_3DES=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_IPCOMP=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_DEBUG=y" >> kernelsrc/.config
%endif
USERCOMPILE="%{rpmcflags}" ; export USERCOMPILE
@@ -134,7 +137,7 @@
%if %{with modules}
- %{__make} precheck verset kpatch ocf confcheck module \
+%{__make} precheck verset kpatch ocf confcheck module \
BIND9STATICLIBDIR=%{_libdir} \
FINALCONFDIR=%{_sysconfdir}/ipsec \
FINALCONFFILE=%{_sysconfdir}/ipsec/ipsec.conf \
@@ -144,58 +147,59 @@
FINALLIBEXECDIR=%{_libdir}/ipsec \
KERNELSRC="`pwd`/kernelsrc"
- install linux/net/ipsec/ipsec.o .
+install linux/net/ipsec/ipsec.o .
- %if %{with smp}
- rm -rf kernelsrc
- install -d kernelsrc
- lndir -silent /usr/src/linux kernelsrc
- mv kernelsrc/.config kernelsrc/.config.old
- cp kernelsrc/.config.old kernelsrc/.config
- %if %{with dist_kernel}
- rm -rf kernelsrc/include/asm
- cd kernelsrc
- patch -R -p1 <../linux/net/Makefile.fs2_%{_kver}.patch
- patch -R -p1 <../linux/net/Config.in.fs2_%{_kver}.patch
- patch -R -p1 <../linux/net/ipv4/af_inet.c.fs2_%{_kver}.patch
- patch -R -p1 <../linux/Documentation/Configure.help.fs2_%{_kver}.patch
- cd ..
- rm -rf kernelsrc/{crypto,include/{freeswan,zlib,crypto},lib/{zlib,libfreeswan},net/ipsec}
- rm kernelsrc/include/{freeswan,pfkey,pfkeyv2}.h
- cp kernelsrc/config-smp kernelsrc/.config
- %endif
- echo "CONFIG_IPSEC=m" >> kernelsrc/.config
- echo "CONFIG_IPSEC_IPIP=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_AH=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_AUTH_HMAC_MD5=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_AUTH_HMAC_SHA1=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_ESP=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_ENC_3DES=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_IPCOMP=y" >> kernelsrc/.config
- echo "CONFIG_IPSEC_DEBUG=y" >> kernelsrc/.config
-
- %{__make} precheck verset kpatch ocf confcheck module \
- BIND9STATICLIBDIR=%{_libdir} \
- FINALCONFDIR=%{_sysconfdir}/ipsec \
- FINALCONFFILE=%{_sysconfdir}/ipsec/ipsec.conf \
- INC_USRLOCAL=/usr \
- INC_MANDIR=share/man \
- FINALRCDIR=%{_sysconfdir}/rc.d/init.d \
- FINALLIBEXECDIR=%{_libdir}/ipsec \
- KERNELSRC="`pwd`/kernelsrc"
- %endif
+%if %{with smp}
+rm -rf kernelsrc
+install -d kernelsrc
+lndir -silent /usr/src/linux kernelsrc
+mv kernelsrc/.config kernelsrc/.config.old
+cp kernelsrc/.config.old kernelsrc/.config
+
+%if %{with dist_kernel}
+rm -rf kernelsrc/include/asm
+cd kernelsrc
+patch -R -p1 <../linux/net/Makefile.fs2_%{_kver}.patch
+patch -R -p1 <../linux/net/Config.in.fs2_%{_kver}.patch
+patch -R -p1 <../linux/net/ipv4/af_inet.c.fs2_%{_kver}.patch
+patch -R -p1 <../linux/Documentation/Configure.help.fs2_%{_kver}.patch
+cd ..
+rm -rf kernelsrc/{crypto,include/{freeswan,zlib,crypto},lib/{zlib,libfreeswan},net/ipsec}
+rm kernelsrc/include/{freeswan,pfkey,pfkeyv2}.h
+cp kernelsrc/config-smp kernelsrc/.config
%endif
+echo "CONFIG_IPSEC=m" >> kernelsrc/.config
+echo "CONFIG_IPSEC_IPIP=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_AH=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_AUTH_HMAC_MD5=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_AUTH_HMAC_SHA1=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_ESP=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_ENC_3DES=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_IPCOMP=y" >> kernelsrc/.config
+echo "CONFIG_IPSEC_DEBUG=y" >> kernelsrc/.config
+%{__make} precheck verset kpatch ocf confcheck module \
+ BIND9STATICLIBDIR=%{_libdir} \
+ FINALCONFDIR=%{_sysconfdir}/ipsec \
+ FINALCONFFILE=%{_sysconfdir}/ipsec/ipsec.conf \
+ INC_USRLOCAL=/usr \
+ INC_MANDIR=share/man \
+ FINALRCDIR=%{_sysconfdir}/rc.d/init.d \
+ FINALLIBEXECDIR=%{_libdir}/ipsec \
+ KERNELSRC="`pwd`/kernelsrc"
+%endif
+
+%endif
%{__make} programs \
- BIND9STATICLIBDIR=%{_libdir} \
- FINALCONFDIR=%{_sysconfdir}/ipsec \
- FINALCONFFILE=%{_sysconfdir}/ipsec/ipsec.conf \
- INC_USRLOCAL=/usr \
- INC_MANDIR=share/man \
- FINALRCDIR=%{_sysconfdir}/rc.d/init.d \
- FINALLIBEXECDIR=%{_libdir}/ipsec \
- KERNELSRC="`pwd`/kernelsrc"
+ BIND9STATICLIBDIR=%{_libdir} \
+ FINALCONFDIR=%{_sysconfdir}/ipsec \
+ FINALCONFFILE=%{_sysconfdir}/ipsec/ipsec.conf \
+ INC_USRLOCAL=/usr \
+ INC_MANDIR=share/man \
+ FINALRCDIR=%{_sysconfdir}/rc.d/init.d \
+ FINALLIBEXECDIR=%{_libdir}/ipsec \
+ KERNELSRC="`pwd`/kernelsrc"
%install
rm -rf $RPM_BUILD_ROOT
@@ -204,34 +208,36 @@
%{__make} install \
BIND9STATICLIBDIR=%{_libdir} \
DESTDIR="$RPM_BUILD_ROOT" \
- FINALCONFDIR=%{_sysconfdir}/ipsec \
+ FINALCONFDIR=%{_sysconfdir}/ipsec \
FINALCONFFILE=%{_sysconfdir}/ipsec/ipsec.conf \
FINALRCDIR=%{_sysconfdir}/rc.d/init.d \
FINALLIBEXECDIR=%{_libdir}/ipsec \
FINALEXAMPLECONFDIR=/usr/share/doc/%{name}-%{version} \
- INC_USRLOCAL=/usr \
- INC_MANDIR=share/man
+ INC_USRLOCAL=/usr \
+ INC_MANDIR=share/man
%if %{with x509}
- install -d $RPM_BUILD_ROOT%{_sysconfdir}/ipsec/ipsec.d
- for i in crls cacerts private policies; do
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/ipsec/ipsec.d
+for i in crls cacerts private policies; do
install -d $RPM_BUILD_ROOT%{_sysconfdir}/ipsec/ipsec.d/$i
- done
- for i in CHANGES README; do
+done
+for i in CHANGES README; do
install %{x509ver}-%{name}-%{version}/$i $i.x509 ;
- done
+done
%endif
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
%if %{with modules}
- install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
- install ipsec.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
- %if %{with smp}
- install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
- install linux/net/ipsec/ipsec.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
- %endif
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+install ipsec.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+
+%if %{with smp}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
+install linux/net/ipsec/ipsec.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
+%endif
+
%endif
%clean
@@ -242,9 +248,9 @@
# not already exist
if [ ! -f %{_sysconfdir}/ipsec/ipsec.secrets ];
then
- echo generate RSA private key...
- /usr/sbin/ipsec newhostkey --output %{_sysconfdir}/ipsec/ipsec.secrets
- chmod 600 %{_sysconfdir}/ipsec/ipsec.secrets
+ echo generate RSA private key...
+ /usr/sbin/ipsec newhostkey --output %{_sysconfdir}/ipsec/ipsec.secrets
+ chmod 600 %{_sysconfdir}/ipsec/ipsec.secrets
fi
/sbin/chkconfig --add ipsec
@@ -259,16 +265,16 @@
if [ -f /var/lock/subsys/ipsec ]; then
/etc/rc.d/init.d/ipsec stop >&2
fi
- /sbin/chkconfig --del ipsec >&2
+ /sbin/chkconfig --del ipsec >&2
fi
-%post -n kernel-net-ipsec
+%post -n kernel-net-ipsec
%depmod %{_kernel_ver}
%postun -n kernel-net-ipsec
%depmod %{_kernel_ver}
-%post -n kernel-smp-net-ipsec
+%post -n kernel-smp-net-ipsec
%depmod %{_kernel_ver}
%postun -n kernel-smp-net-ipsec
@@ -315,6 +321,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.80 2006/08/12 09:28:44 ankry
+- formatting
+
Revision 1.79 2006/03/09 14:35:10 glen
- quote %{__cc}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/fcron.spec?r1=1.35&r2=1.36&f=u
http://cvs.pld-linux.org/SPECS/fedora-rpmdevtools.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/fftw.spec?r1=1.63&r2=1.64&f=u
http://cvs.pld-linux.org/SPECS/freeswan.spec?r1=1.79&r2=1.80&f=u
More information about the pld-cvs-commit
mailing list