rpms/sysklogd/F-10 import.log, 1.2, 1.3 sysklogd.spec, 1.62, 1.63 sysklogd-1.5-empty-debuginfo.patch, 1.1, NONE

[Jeroen van Meeuwen]

Author: kanarip

Update of /cvs/pkgs/rpms/sysklogd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25116/F-10

Modified Files:
	import.log sysklogd.spec 
Removed Files:
	sysklogd-1.5-empty-debuginfo.patch 
Log Message:
1.5-4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sysklogd/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Oct 2008 23:20:24 -0000	1.2
+++ import.log	13 Dec 2008 13:23:55 -0000	1.3
@@ -1,2 +1,3 @@
 sysklogd-1_5-2_fc10:HEAD:sysklogd-1.5-2.fc10.src.rpm:1219609538
 sysklogd-1_5-3_fc9:HEAD:sysklogd-1.5-3.fc9.src.rpm:1224199204
+sysklogd-1_5-4_fc10:F-10:sysklogd-1.5-4.fc10.src.rpm:1229174613


Index: sysklogd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysklogd/F-10/sysklogd.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sysklogd.spec	16 Oct 2008 23:20:24 -0000	1.62
+++ sysklogd.spec	13 Dec 2008 13:23:56 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -10,7 +10,6 @@
 Source2: sysklogd-%{version}.init
 Source3: sysklogd-%{version}.logrotate
 Source4: sysklogd-%{version}.sysconfig
-Patch0: sysklogd-1.5-empty-debuginfo.patch
 Conflicts: logrotate < 3.5.2
 Conflicts: rsyslog, syslog-ng
 Requires: logrotate
@@ -21,6 +20,9 @@
 Provides: syslog
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%define _bindir /bin
+%define _sbindir /sbin
+
 %description
 The sysklogd package contains two system utilities (syslogd and klogd)
 which provide support for system logging.  Syslogd and klogd run as
@@ -37,7 +39,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %ifarch s390 s390x
 perl -pi -e 's/-fpie/-fPIE/' Makefile
 %endif
@@ -56,7 +57,7 @@
 mkdir -p $RPM_BUILD_ROOT/sbin
 
 make install prefix=$RPM_BUILD_ROOT TOPDIR=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT%{_mandir} \
-	MAN_USER=`id -nu` MAN_GROUP=`id -ng`
+	BINDIR=$RPM_BUILD_ROOT%{_sbindir} MAN_USER=`id -nu` MAN_GROUP=`id -ng`
 
 mkdir -p $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig}
 
@@ -122,6 +123,9 @@
 #%{_includedir}/sysklogd/*
 
 %changelog
+* Sat Dec 13 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> 1.5-4
+- Put binaries in the correct path (#471701)
+
 * Fri Oct 17 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> 1.5-3
 - Don't strip binaries (results in empty debuginfo package), #465139
 


--- sysklogd-1.5-empty-debuginfo.patch DELETED ---