richard: server/kolab-resource-handlers/kolab-resource-handlers ChangeLog, 1.2, 1.3 Makefile.am, 1.2, 1.3 kolab-resource-handlers.spec.in, 1.1, 1.2

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv2422/kolab-resource-handlers

Modified Files:
	ChangeLog Makefile.am kolab-resource-handlers.spec.in 
Log Message:
* ../Makefile: the rpm could not be build, fixed by copying the
  kolabd Makefile and some little adaptions to it
* kolab-resource-handlers.spec.in: simplified the %setup tag and
  the configure command
* Makefile.am: group resmgr/kolabfilter.php and
  resmgr/kolabmailboxfilter.php into the conffile_FILES
  Create the directories $(resmgr_filterdir) and $(freebusy_cachedir)
  during installation
* freebusy/pfb.php.in,
  freebusy/freebusy.php.in: @freebusy_cachefile@ replaced by
  @freebusy_cachedir@
* resmgr/kolabfilter.php.in,
  resmgr/kolabmailboxfilter.php.in: @resmgr_filter@ replaced by
  @resmgr_filterdir@



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	14 Dec 2005 19:40:02 -0000	1.2
+++ ChangeLog	17 Dec 2005 11:05:56 -0000	1.3
@@ -1,3 +1,19 @@
+2005-12-17 richard Bos <richard at radoeka.nl>
+	* ../Makefile: the rpm could not be build, fixed by copying the
+	  kolabd Makefile
+	* kolab-resource-handlers.spec.in: simplified the %setup tag and
+	  the configure command
+	* Makefile.am: group resmgr/kolabfilter.php and
+	  resmgr/kolabmailboxfilter.php into the conffile_FILES
+	  Create the directories $(resmgr_filterdir) and $(freebusy_cachedir)
+	  during installation
+	* freebusy/pfb.php.in,
+	  freebusy/freebusy.php.in: @freebusy_cachefile@ replaced by
+	  @freebusy_cachedir@
+	* resmgr/kolabfilter.php.in,
+	  resmgr/kolabmailboxfilter.php.in: @resmgr_filter@ replaced by
+	  @resmgr_filterdir@
+
 2005-12-14 richard Bos <richard at radoeka.nl>
 	* AUTHORS: added
 	* NEWS: added, with the latest news from: release-notes.txt

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	14 Dec 2005 19:40:02 -0000	1.2
+++ Makefile.am	17 Dec 2005 11:05:56 -0000	1.3
@@ -23,20 +23,15 @@
 
 
 conffile_FILES = $(srcdir)/freebusy/freebusy.conf \
-	resmgr/resmgr.conf
+	resmgr/resmgr.conf \
+	resmgr/kolabfilter.php \
+	resmgr/kolabmailboxfilter.php
 
 conffiledir = $(resmgr_confdir)
 conffile_DATA = $(conffile_FILES)
 EXTRA_DIST += freebusy/freebusy.conf
 
 
-resmgr_filter_FILES = resmgr/kolabfilter.php \
-	resmgr/kolabmailboxfilter.php
-
-resmgr_filterdir = $(resmgr_confdir)
-resmgr_filter_DATA = $(resmgr_filter_FILES)
-
-
 resmgr_FILES = resmgr/kolabmailtransport.php \
 	resmgr/misc.php \
 	resmgr/resmgr.php \
@@ -86,8 +81,10 @@
 EXTRA_DIST += dist_conf
 
 install-data-hook:
-	chmod a+x $(DESTDIR)/$(resmgr_filterdir)/kolabfilter.php
-	chmod a+x $(DESTDIR)/$(resmgr_filterdir)/kolabmailboxfilter.php
-	chmod o=--- $(DESTDIR)/$(resmgr_filterdir)/freebusy.conf
-	chmod o=--- $(DESTDIR)/$(resmgr_filterdir)/resmgr.conf
+	install -d -m 755 $(DESTDIR)/$(resmgr_filterdir)
+	install -d -m 755 $(DESTDIR)/$(freebusy_cachedir)
+	chmod a+x $(DESTDIR)/$(resmgr_confdir)/kolabfilter.php
+	chmod a+x $(DESTDIR)/$(resmgr_confdir)/kolabmailboxfilter.php
+	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/freebusy.conf
+	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/resmgr.conf
 

Index: kolab-resource-handlers.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-resource-handlers.spec.in	5 Dec 2005 14:13:42 -0000	1.1
+++ kolab-resource-handlers.spec.in	17 Dec 2005 11:05:56 -0000	1.2
@@ -29,11 +29,10 @@
 Blah blah
 
 %prep
-	%setup0 -q -T -b 0 -n kolab-resource-handlers
+%setup -q
 
 %build
-%configure --prefix=/kolab \
-	--enable-dist=kolab
+%configure --prefix=/kolab
 
 %install
 %__make DESTDIR=%{buildroot} install