[svn] r9742 - in /trunk/rpms/incron: incron-0.5.7-gcc43.patch incron-gcc44.patch incron.spec

Yury V. Zaytsev yury at shurup.com
Mon Mar 7 20:40:54 CET 2011


Author: yury
Date: Mon Mar  7 19:40:54 2011
New Revision: 9742

URL: http://svn.rpmforge.net/viewvc/rpmforge?rev=9742&view=rev
Log:
Fixed incron build failure on EL6


Added:
    trunk/rpms/incron/incron-gcc44.patch
Removed:
    trunk/rpms/incron/incron-0.5.7-gcc43.patch
Modified:
    trunk/rpms/incron/incron.spec

Removed: trunk/rpms/incron/incron-0.5.7-gcc43.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/incron/incron-0.5.7-gcc43.patch?rev=9741&view=log
==============================================================================
--- trunk/rpms/incron/incron-0.5.7-gcc43.patch (original)
+++ trunk/rpms/incron/incron-0.5.7-gcc43.patch (removed)
@@ -1,24 +1,0 @@
-diff -up incron-0.5.7/appargs.h.orig incron-0.5.7/appargs.h
---- incron-0.5.7/appargs.h.orig	2008-02-09 13:45:31.000000000 +0100
-+++ incron-0.5.7/appargs.h	2008-02-09 13:45:39.000000000 +0100
-@@ -23,7 +23,7 @@
- #ifndef APPARGS_H_
- #define APPARGS_H_
- 
--#include <string>
-+#include <cstring>
- #include <map>
- #include <deque>
- 
-diff -up incron-0.5.7/incroncfg.h.orig incron-0.5.7/incroncfg.h
---- incron-0.5.7/incroncfg.h.orig	2008-02-09 13:45:06.000000000 +0100
-+++ incron-0.5.7/incroncfg.h	2008-02-09 13:45:13.000000000 +0100
-@@ -18,7 +18,7 @@
- #define INCRONCFG_H_
- 
- 
--#include <string>
-+#include <cstring>
- #include <map>
- 
- /// Configuration class.

Added: trunk/rpms/incron/incron-gcc44.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/incron/incron-gcc44.patch?rev=9742&view=markup
==============================================================================
--- trunk/rpms/incron/incron-gcc44.patch (added)
+++ trunk/rpms/incron/incron-gcc44.patch Mon Mar  7 19:40:54 2011
@@ -1,0 +1,56 @@
+diff -up incron-0.5.8/appargs.cpp.orig incron-0.5.8/appargs.cpp
+--- incron-0.5.8/appargs.cpp.orig	2009-02-25 11:10:59.000000000 +0100
++++ incron-0.5.8/appargs.cpp	2009-02-25 11:11:11.000000000 +0100
+@@ -21,6 +21,7 @@
+ 
+ 
+ #include <cstring>
++#include <cstdio>
+ 
+ #include "strtok.h"
+ 
+diff -up incron-0.5.8/appinst.h.orig incron-0.5.8/appinst.h
+--- incron-0.5.8/appinst.h.orig	2008-12-29 17:31:09.000000000 +0100
++++ incron-0.5.8/appinst.h	2009-02-25 11:10:23.000000000 +0100
+@@ -23,6 +23,7 @@
+ 
+ 
+ #include <string>
++#include <cstdio>
+ 
+ 
+ #define APPLOCK_BASEDIR "/var/run"
+diff -up incron-0.5.8/incroncfg.cpp.orig incron-0.5.8/incroncfg.cpp
+--- incron-0.5.8/incroncfg.cpp.orig	2008-12-29 17:31:09.000000000 +0100
++++ incron-0.5.8/incroncfg.cpp	2009-02-25 11:10:23.000000000 +0100
+@@ -181,7 +181,7 @@ bool IncronCfg::ParseLine(const char* s,
+ 
+ bool IncronCfg::IsComment(const char* s)
+ {
+-  char* sx = strchr(s, '#');
++  const char* sx = strchr(s, '#');
+   if (sx == NULL)
+     return false;
+     
+diff -up incron-0.5.8/incroncfg.h.orig incron-0.5.8/incroncfg.h
+--- incron-0.5.8/incroncfg.h.orig	2008-12-29 17:31:09.000000000 +0100
++++ incron-0.5.8/incroncfg.h	2009-02-25 11:10:23.000000000 +0100
+@@ -19,6 +19,7 @@
+ 
+ 
+ #include <cstring>
++#include <cstdio>
+ #include <map>
+ 
+ /// Configuration class.
+diff -up incron-0.5.8/inotify-cxx.h.orig incron-0.5.8/inotify-cxx.h
+--- incron-0.5.8/inotify-cxx.h.orig	2008-12-29 17:31:09.000000000 +0100
++++ incron-0.5.8/inotify-cxx.h	2009-02-25 11:10:23.000000000 +0100
+@@ -28,6 +28,7 @@
+ 
+ #include <stdint.h>
+ #include <string>
++#include <cstdio>
+ #include <deque>
+ #include <map>
+ 

Modified: trunk/rpms/incron/incron.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/incron/incron.spec?rev=9742&r1=9741&r2=9742&view=diff
==============================================================================
--- trunk/rpms/incron/incron.spec (original)
+++ trunk/rpms/incron/incron.spec Mon Mar  7 19:40:54 2011
@@ -4,16 +4,17 @@
 Summary: Inotify cron system
 Name: incron
 Version: 0.5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://inotify.aiken.cz/
 
 Source: http://inotify.aiken.cz/download/incron/incron-%{version}.tar.bz2
+Patch0: incron-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires: /sbin/chkconfig
-Requires: /sbin/service
+Requires(post):  /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
 
 %description
 incron is an "inotify cron" system. incron consists of a daemon and a table
@@ -23,6 +24,7 @@
 
 %prep
 %setup
+%patch0 -p1 -b .cstdlib
 
 %{__cat} <<'EOF' >incrond.sysv
 #!/bin/bash
@@ -98,19 +100,17 @@
 %{__rm} -rf %{buildroot}
 
 #%{__make} install DESTDIR="%{buildroot}"
+
+#install files manually since source Makefile tries to do it as root
 %{__install} -Dp -m0755 incrond %{buildroot}%{_sbindir}/incrond
 %{__install} -Dp -m4755 incrontab %{buildroot}%{_bindir}/incrontab
 %{__install} -Dp -m0755 incrond.sysv %{buildroot}%{_initrddir}/incrond
-
-%{__install} -Dp -m0400 incrontab.1 %{buildroot}%{_mandir}/man1/incrontab.1
-%{__install} -Dp -m0400 incrontab.5 %{buildroot}%{_mandir}/man5/incrontab.5
-%{__install} -Dp -m0400 incron.conf.5 %{buildroot}%{_mandir}/man5/incron.conf.5
-%{__install} -Dp -m0400 incrond.8 %{buildroot}%{_mandir}/man8/incrond.8
-
 %{__install} -Dp -m0644 incron.conf.example %{buildroot}%{_sysconfdir}/incron.conf
-
 %{__install} -d %{buildroot}%{_sysconfdir}/incron.d/
 %{__install} -d %{buildroot}%{_localstatedir}/spool/incron/
+
+# install manpages
+make install-man MANPATH="%{buildroot}%{_mandir}" INSTALL="install -D -p"
 
 %post
 if [ $1 -eq 1 ]; then
@@ -148,6 +148,9 @@
 %{_bindir}/incrontab
 
 %changelog
+* Mon Mar 07 2011 Yury V. Zaytsev <yury at shurup.com> - 0.5.9-2
+- Fixed build failure on EL6 (thanks to Paul Evans!)
+
 * Wed Jun 24 2009 Dag Wieers <dag at wieers.com> - 0.5.9-1
 - Updated to release 0.5.9.
 




More information about the commits mailing list