Author: glen Date: Wed Sep 13 05:42:06 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged changes from HEAD: - use cvs patch (drop patches already in cvs) - oh and according to debian package syslogd is under Berkeley copyright, klogd is under GPL
---- Files affected: SPECS: sysklogd.spec (1.112.2.5 -> 1.112.2.6) ---- Diffs: ================================================================ Index: SPECS/sysklogd.spec diff -u SPECS/sysklogd.spec:1.112.2.5 SPECS/sysklogd.spec:1.112.2.6 --- SPECS/sysklogd.spec:1.112.2.5 Sat Sep 9 17:55:46 2006 +++ SPECS/sysklogd.spec Wed Sep 13 07:42:01 2006 @@ -10,8 +10,8 @@ Summary(tr): Linux sistem ve çekirdek kayýt süreci Name: sysklogd Version: 1.4.1 -Release: 24 -License: GPL +Release: 25 +License: BSD/GPL Group: Daemons Source0: http://www.ibiblio.org/pub/Linux/system/daemons/%{name}-%{version}.tar.gz # Source0-md5: d214aa40beabf7bdb0c9b3c64432c774 @@ -23,27 +23,27 @@ Source6: klogd.sysconfig Source7: syslogd-listfiles.sh Source8: syslogd-listfiles.8 -Patch0: %{name}-alpha.patch -Patch1: %{name}-alphafoo.patch -Patch2: %{name}-opt.patch -Patch3: %{name}-glibc.patch -Patch4: %{name}-sparc.patch -Patch5: %{name}-install.patch -Patch6: %{name}-utmp-process.patch -Patch7: %{name}-openlog.patch -Patch8: %{name}-security.patch -Patch9: %{name}-nullterm.patch -Patch10: %{name}-fmt-string.patch -Patch11: %{name}-2.4headers.patch +Patch0: %{name}-cvs.patch +Patch1: %{name}-bind.patch +Patch2: %{name}-querymod.patch +Patch3: %{name}-alpha.patch +Patch4: %{name}-alphafoo.patch +Patch5: %{name}-opt.patch +Patch6: %{name}-glibc.patch +Patch7: %{name}-sparc.patch +Patch8: %{name}-install.patch +Patch9: %{name}-openlog.patch +Patch10: %{name}-security.patch +Patch11: %{name}-fmt-string.patch Patch12: %{name}-SO_BSDCOMPAT.patch Patch13: %{name}-ksyms.patch -Patch14: %{name}-sighandler.patch URL: http://www.infodrom.org/projects/sysklogd/ BuildRequires: rpmbuild(macros) >= 1.268 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _exec_prefix / -%define _bindir /usr/sbin +%define _bindir /usr/sbin +%define _sbindir /sbin %description This is the Linux system and kernel logging program. It is run as a @@ -93,16 +93,19 @@ Summary: Linux system logger Summary(de): Linux-System-Logger Summary(pl): Program logujący zdarzenia w systemie Linux +License: BSD Group: Daemons Requires(post): fileutils Requires(post,preun): /sbin/chkconfig Requires(post,preun): rc-scripts >= 0.2.0 Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel +Requires(pre): /usr/lib/rpm/user_group.sh Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/usermod Requires(triggerpostun): sed >= 4.0 # for vservers we don't need klogd and syslog works without klogd # (just it doesn't log kernel buffer into syslog) @@ -134,15 +137,18 @@ Summary: Linux kernel logger Summary(de): Linux-Kerner-Logger Summary(pl): Program logujący zdarzenia w jądrze Linuksa +License: GPL Group: Daemons Requires(post,preun): /sbin/chkconfig Requires(post,preun): rc-scripts >= 0.2.0 Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel +Requires(pre): /usr/lib/rpm/user_group.sh Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/usermod Provides: group(syslog) Provides: user(syslog) Obsoletes: sysklogd @@ -171,12 +177,11 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build %{__make} \ CC="%{__cc}" \ - OPTIMIZE="%{rpmcflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \ + OPTIMIZE="%{rpmcflags}" \ LDFLAGS="%{rpmldflags}" %install @@ -304,9 +309,7 @@ %defattr(644,root,root,755) %attr(754,root,root) /etc/rc.d/init.d/klogd %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/klogd - %attr(755,root,root) %{_sbindir}/klogd - %{_mandir}/man8/klog* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -315,6 +318,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.112.2.6 2006/09/13 05:42:01 glen +- merged changes from HEAD: + - use cvs patch (drop patches already in cvs) + - oh and according to debian package syslogd is under Berkeley copyright, klogd is under GPL + Revision 1.112.2.5 2006/09/09 15:55:46 glen - rel 24 (rebuild with fixed %useradd/%groupadd macros) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sysklogd.spec?r1=1.112.2.5&r2=1.112.2.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
