rpms/uucp/devel uucp.spec,1.39,1.40
Ondrej Vasik
ovasik at fedoraproject.org
Tue Dec 15 13:26:57 UTC 2009
Author: ovasik
Update of /cvs/pkgs/rpms/uucp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14220
Modified Files:
uucp.spec
Log Message:
Merge Review(#226521) - add _smp_mflags to make, remove implicit target, fix rpmlint warnings, commented patches, fix build root, use buildrequires/requires instead of prereq
Index: uucp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- uucp.spec 27 Jul 2009 06:41:15 -0000 1.39
+++ uucp.spec 15 Dec 2009 13:26:57 -0000 1.40
@@ -7,23 +7,31 @@
Summary: A set of utilities for operations between systems
Name: uucp
Version: 1.07
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPLv2+
Group: Applications/Communications
Url: http://www.airs.com/ian/uucp.html
Source0: ftp://ftp.gnu.org/pub/gnu/uucp/uucp-%{version}.tar.gz
Source1: uucp.log
Source2: uucp.xinetd
+#Make the policy header better readable
Patch0: uucp-1.07-config.patch
Patch3: uucp-1.07-sigfpe.patch
+#Use baudboy.h to create per-device lock(s) in /var/lock.
Patch6: uucp-1.07-baudboy.patch
+#Fix to deny to use address in pipe ports.(thanks joery at dorchain.net)(#60771)
Patch8: uucp-1.06.1-pipe.patch
+#fix truncation of values on 32b platforms where statvfs64
+#is being called on a large file system (#153259)
Patch9: uucp-1.07-lfs.patch
+#fix crashes with SIGFPE (#150978) (from Wolfgang Ocker)
Patch10: uucp-1.07-sigfpe2.patch
-Prereq: fileutils /sbin/install-info
-BuildPrereq: lockdev-devel >= 1.0.0-14
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(post): coreutils
+BuildRequires: lockdev-devel >= 1.0.0-14
Requires: lockdev >= 1.0.0-14
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tetex, texi2html
%description
@@ -43,7 +51,7 @@ local machines.
%build
export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
%configure --with-newconfigdir=%{_newconfigdir} --with-oldconfigdir=%{_oldconfigdir}
-make all
+make %{?_smp_mflags}
%install
rm -rf ${RPM_BUILD_ROOT}
@@ -59,18 +67,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_varspooldir
mkdir -p ${RPM_BUILD_ROOT}%{_varspooldir}/uucppublic
mkdir -p ${RPM_BUILD_ROOT}%{_oldconfigdir}
-mkdir -p ${RPM_BUILD_ROOT}/usr/lib/uucp
-ln -sf ../../sbin/uucico ${RPM_BUILD_ROOT}/usr/lib/uucp/uucico
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/uucp
+ln -sf ../../sbin/uucico ${RPM_BUILD_ROOT}%{_libdir}/uucp/uucico
mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
-install -m 644 $RPM_SOURCE_DIR/uucp.log ${RPM_BUILD_ROOT}/etc/logrotate.d/uucp
+install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}/etc/logrotate.d/uucp
mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.d/uucp
# Create ghost files
for n in Log Stats Debug; do
- touch ${RPM_BUILD_ROOT}%{_varlogdir}/$n
+ touch ${RPM_BUILD_ROOT}%{_varlogdir}/$n
done
# the following is kind of gross, but it is effective
@@ -111,7 +119,7 @@ if [ $1 = 0 ]; then
fi
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc README COPYING ChangeLog NEWS TODO
%doc sample contrib uucp.html
@@ -130,8 +138,8 @@ fi
%attr(0755,uucp,uucp) %{_sbindir}/uuconv
%attr(0755,root,root) %{_sbindir}/uusched
-%attr(755,uucp,uucp) %dir /usr/lib/uucp
-/usr/lib/uucp/uucico
+%attr(755,uucp,uucp) %dir %{_libdir}/uucp
+%{_libdir}/uucp/uucico
%{_mandir}/man[18]/*
%{_infodir}/uucp.info*
@@ -157,6 +165,11 @@ fi
%config(noreplace) %{_newconfigdir}/sys
%changelog
+* Tue Dec 15 2009 Ondrej Vasik <ovasik at redhat.com> - 1.07-21
+- Merge Review(#226521) - add _smp_mflags to make, remove implicit
+ target, fix rpmlint warnings, commented patches, fix build root,
+ use buildrequires/requires instead of prereq
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -267,7 +280,7 @@ fi
* Tue Sep 4 2001 Jeff Johnson <jbj at redhat.com>
- build against lockdev-1.0.0-14, with
-- swap egid and gid for lockdev's access(2) device check (#52029).
+- swap egid and gid for lockdev's access(2) device check (#52029).
- add (noreplace) to all config files.
* Tue Aug 28 2001 Jeff Johnson <jbj at redhta.com>
@@ -299,7 +312,7 @@ fi
- change perms to be root:root for the config files and
0640,root:uucp for config files containing passwords
- add patch from #6151 (division by zero, SIGFPE)
-- make %post work also for simple sh-versions
+- make %%post work also for simple sh-versions
* Mon Feb 7 2000 Jeff Johnson <jbj at redhat.com>
- compress man pages.
@@ -307,7 +320,7 @@ fi
* Mon Aug 23 1999 Jeff Johnson <jbj at redhat.com>
- add notifempty/missingok to logrotate config file (#4138).
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
- auto rebuild in the new build environment (release 19)
* Tue Dec 22 1998 Bill Nottingham <notting at redhat.com>
More information about the fedora-extras-commits
mailing list