[packages/incron] - release 1

[blues]

commit 84bbccc5c8deb8b8783323ff2906652f5ccfff8d
Author: Paweł Gołaszewski <blues at pld-linux.org>
Date:   Sun Oct 21 11:34:20 2012 +0200

    - release 1
    
    Updated DESTDIR patch, some parts outdated.

 incron-DESTDIR.patch | 74 +++++++++++++++++-----------------------------------
 incron.spec          |  9 ++++---
 2 files changed, 29 insertions(+), 54 deletions(-)
---
diff --git a/incron.spec b/incron.spec
index 386d4dd..29095cc 100644
--- a/incron.spec
+++ b/incron.spec
@@ -4,7 +4,7 @@
 Summary:	incron :: inotify cron system
 Name:		incron
 Version:	0.5.10
-Release:	0.1
+Release:	1
 License:	GPL v2
 Group:		Daemons
 Source0:	http://inotify.aiken.cz/download/incron/%{name}-%{version}.tar.bz2
@@ -33,14 +33,15 @@ rather than time periods.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 
 %build
 %{__make} \
 	LDFLAGS="%{rpmldflags} -Wall" \
-	CXXFLAGS="%{rpmcxxflags} -pipe -Wall" \
 	CXX="%{__cxx}" \
+	OPTIMIZE="%{rpmcxxflags}" \
+	DEBUG=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +54,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,incron.d} \
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/incron.conf{.example,}
+install incron.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/incron.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/incron-DESTDIR.patch b/incron-DESTDIR.patch
index 4f02e95..6bd117a 100644
--- a/incron-DESTDIR.patch
+++ b/incron-DESTDIR.patch
@@ -1,69 +1,43 @@
---- ./Makefile.org	2007-09-04 15:48:33.000000000 +0000
-+++ ./Makefile	2008-12-02 15:13:38.618097179 +0000
-@@ -6,6 +6,8 @@ CFGDIR = /etc
- MANPATH = /usr/share/man
+--- ./Makefile.org	2012-10-21 11:14:28.344333697 +0200
++++ ./Makefile	2012-10-21 11:21:18.529741774 +0200
+@@ -7,8 +7,10 @@ MANPATH = $(PREFIX)/share/man
  RELEASE = incron-`cat VERSION`
  RELEASEDIR = /tmp/$(RELEASE)
-+SBINDIR = $(PREFIX)/sbin
+ DOCDIR = $(PREFIX)/share/doc/$(RELEASE)/
 +BINDIR = $(PREFIX)/bin
++SBINDIR = $(PREFIX)/sbin
  
- USER = root
+-USER = root
++USER = `id -u`
  
-@@ -44,33 +46,36 @@ clean:
+ CXX ?= g++
+ INSTALL = install
+@@ -45,13 +47,13 @@ clean:
  distclean: clean
  
  install:	all install-man
--	[ -d $(PREFIX) ]
--	$(INSTALL) -m 04755 -o $(USER) incrontab $(PREFIX)/bin/
--	$(INSTALL) -m 0755 incrond $(PREFIX)/sbin/
--	$(INSTALL) -m 0755 -o $(USER) -d $(USERDATADIR)
--	$(INSTALL) -m 0755 -o $(USER) -d $(SYSDATADIR)
--	$(INSTALL) -m 0644 -o $(USER) incron.conf.example $(CFGDIR)
-+	[ -d $(DESTDIR)$(PREFIX) ]
+-	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/bin/
+-	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/sbin/
 +	$(INSTALL) -m 0755 -d $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 0755 -d $(DESTDIR)$(SBINDIR)
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(USERDATADIR)
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(SYSDATADIR)
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(CFGDIR)
-+	$(INSTALL) -m 0755 incrontab $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR)/
+-	$(INSTALL) -m 04755 -o $(USER) incrontab $(DESTDIR)$(PREFIX)/bin/
+-	$(INSTALL) -m 0755 incrond $(DESTDIR)$(PREFIX)/sbin/
+ 	$(INSTALL) -m 0755 -o $(USER) -d $(DESTDIR)$(USERDATADIR)
+ 	$(INSTALL) -m 0755 -o $(USER) -d $(DESTDIR)$(SYSDATADIR)
++	$(INSTALL) -m 04755 -o $(USER) incrontab $(DESTDIR)$(BINDIR)
 +	$(INSTALL) -m 0755 incrond $(DESTDIR)$(SBINDIR)
-+	$(INSTALL) -m 0644 incron.conf.example $(DESTDIR)$(CFGDIR)
+ 	$(INSTALL) -m 0644 incron.conf.example $(DESTDIR)$(DOCDIR)/
  
  install-man:	incrontab.1 incrontab.5 incrond.8 incron.conf.5
--	$(INSTALL) -m 0755 -d $(MANPATH)/man1
--	$(INSTALL) -m 0755 -d $(MANPATH)/man5
--	$(INSTALL) -m 0755 -d $(MANPATH)/man8
--	$(INSTALL) -m 0644 incrontab.1 $(MANPATH)/man1
--	$(INSTALL) -m 0644 incrontab.5 $(MANPATH)/man5
--	$(INSTALL) -m 0644 incrond.8 $(MANPATH)/man8
--	$(INSTALL) -m 0644 incron.conf.5 $(MANPATH)/man5
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man1
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man5
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man8
-+	$(INSTALL) -m 0644 incrontab.1 $(DESTDIR)$(MANPATH)/man1
-+	$(INSTALL) -m 0644 incrontab.5 $(DESTDIR)$(MANPATH)/man5
-+	$(INSTALL) -m 0644 incrond.8 $(DESTDIR)$(MANPATH)/man8
-+	$(INSTALL) -m 0644 incron.conf.5 $(DESTDIR)$(MANPATH)/man5
+@@ -64,8 +66,8 @@ install-man:	incrontab.1 incrontab.5 inc
+ 	$(INSTALL) -m 0644 incron.conf.5 $(DESTDIR)$(MANPATH)/man5
  
  uninstall:	uninstall-man
--	[ -d $(PREFIX) ]
--	rm -f $(PREFIX)/bin/incrontab
--	rm -f $(PREFIX)/sbin/incrond
--	rm -f $(CFGDIR)/incron.conf.example
-+	[ -d $(DESTDIR)$(PREFIX) ]
+-	rm -f $(DESTDIR)$(PREFIX)/bin/incrontab
+-	rm -f $(DESTDIR)$(PREFIX)/sbin/incrond
 +	rm -f $(DESTDIR)$(BINDIR)/incrontab
 +	rm -f $(DESTDIR)$(SBINDIR)/incrond
-+	rm -f $(DESTDIR)$(CFGDIR)/incron.conf.example
+ 	rm -rf $(DESTDIR)$(DOCDIR)/
  
  uninstall-man:
--	rm -f $(MANPATH)/man1/incrontab.1
--	rm -f $(MANPATH)/man5/incrontab.5
--	rm -f $(MANPATH)/man8/incrond.8
--	rm -f $(MANPATH)/man5/incron.conf.5
-+	rm -f $(DESTDIR)$(MANPATH)/man1/incrontab.1
-+	rm -f $(DESTDIR)$(MANPATH)/man5/incrontab.5
-+	rm -f $(DESTDIR)$(MANPATH)/man8/incrond.8
-+	rm -f $(DESTDIR)$(MANPATH)/man5/incron.conf.5
- 
- update:		uninstall install
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/incron.git/commitdiff/84bbccc5c8deb8b8783323ff2906652f5ccfff8d