gunnar: server/perl-kolab MANIFEST, 1.5, 1.6 Makefile.PL, 1.9, 1.10 perl-kolab.spec, 1.105, 1.106

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv24385

Modified Files:
	MANIFEST Makefile.PL perl-kolab.spec 
Log Message:
Move split install instructions from the spec file to the Makefile as per comment by Richard Bos.

Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MANIFEST	10 Oct 2008 14:22:03 -0000	1.5
+++ MANIFEST	8 Nov 2008 07:35:44 -0000	1.6
@@ -1,17 +1,17 @@
 AUTHORS
 ChangeLog
 INSTALL
-bin/kolab_bootstrap.in
-bin/kolabcheckperm.in
-bin/kolabconf.in
 bin/kolabdcachetool.in
-bin/kolabd.in
 bin/kolabpasswd.in
 bin/kolabquotareport.in
 bin/kolabquotawarn.in
 bin/kolab_smtpdpolicy.in
 bin/kolab_upgrade.in
-data/quotawarning.txt
+sbin/kolab_bootstrap.in
+sbin/kolabcheckperm.in
+sbin/kolabconf.in
+sbin/kolabd.in
+data/etc/quotawarning.txt
 lib/Kolab.pm
 lib/Kolab/Conf.pm
 lib/Kolab/Cyrus.pm

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.PL	7 Nov 2008 18:58:08 -0000	1.9
+++ Makefile.PL	8 Nov 2008 07:35:44 -0000	1.10
@@ -8,16 +8,20 @@
 my $HELP = 0;
 my $CONFIG = '/kolab/etc/kolab';
 my $INSTALLSCRIPT = '/kolab/bin';
+my $INSTALLSBIN = '/kolab/sbin';
+my $INSTALLETC = '/kolab/etc/kolab';
 
 GetOptions(
     "config=s" => \$CONFIG,
     "bin=s" => \$INSTALLSCRIPT,
+    "sbin=s" => \$INSTALLSBIN,
+    "etc=s" => \$INSTALLETC,
     "help" => \$HELP
     );
 
 if ($HELP) {
   print <<'EOH';
-Usage: perl Makefile.PL [--config CONFIG_DIR] [--bin BIN_DIR] --help
+Usage: perl Makefile.PL [--config CONFIG_DIR] [--bin BIN_DIR] [--sbin SBIN_DIR] --help
 
 Option config
 
@@ -29,6 +33,10 @@
 
   to specify the path to the directory where scripts should be installed.
 
+Option sbin
+
+  to specify the path to the directory where admin scripts should be installed.
+
 Option help
 
   to get this text.
@@ -67,11 +75,44 @@
     return $clean;
 }
 
+# Install sbin files
+sub MY::install {
+    package MY;   # To help SUPER work right
+    my $self = shift;
+    my @m;
+    
+    push(@m, $self->SUPER::install(@_));
+    
+    my $install = join "", @m;
+
+    $install =~ s/(install.*)/$1 install_sbin install_etc/;
+     
+    return $install;
+}
+
 sub MY::postamble {
     
     my $add = "bin/%: bin/%.in
 	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
 
+sbin/%: sbin/%.in
+	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
+
+SBIN_TARGETS=sbin/kolabconf sbin/kolab_bootstrap sbin/kolabd sbin/kolabcheckperm
+
+install_sbin: \$(SBIN_TARGETS)
+	mkdir -p \$(DESTDIR)/$INSTALLSBIN
+	for SBIN in \$(SBIN_TARGETS); do               \\
+	  cp \$\$SBIN \$(DESTDIR)/$INSTALLSBIN;        \\
+	done
+	chmod 755 \$(DESTDIR)/$INSTALLSBIN/*
+
+install_etc:
+	mkdir -p \$(DESTDIR)/$INSTALLETC
+	for ETC in data/etc/*; do                    \\
+	  cp \$\$ETC \$(DESTDIR)/$INSTALLETC;        \\
+	done
+
 ifeq \"x\$(RPM)\" \"x\"
   RPM = \$(HOME)/bin/openpkg rpm
 endif
@@ -134,11 +175,7 @@
     INSTALLDIRS       => 'vendor',
     EXE_FILES         => [ 'bin/kolab_smtpdpolicy',
                            'bin/kolabquotareport',
-                           'bin/kolabcheckperm',
-                           'bin/kolabconf',
                            'bin/kolabdcachetool',
-                           'bin/kolabd',
-                           'bin/kolab_bootstrap',
                            'bin/kolabpasswd',
                            'bin/kolabquotawarn',
                            'bin/kolab_upgrade',],

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- perl-kolab.spec	7 Nov 2008 18:58:08 -0000	1.105
+++ perl-kolab.spec	8 Nov 2008 07:35:44 -0000	1.106
@@ -72,16 +72,13 @@
 
 %install
     %{l_prefix}/bin/perl-openpkg prepare
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE0}  -A "--config \"%{l_prefix}/etc/kolab\" --bin \"%{l_prefix}/bin\"" configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE0}  -A \
+      "--config \"%{l_prefix}/etc/kolab\" --bin \"%{l_prefix}/bin\" --sbin \"%{l_prefix}/sbin\" --etc \"%{l_prefix}/etc\"" \
+      configure build install
+    cd %{V_package}-%{V_source_tag}
+    make install_sbin install_etc
+    cd ..
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
-    mkdir -p $RPM_BUILD_ROOT/%{l_prefix}/sbin
-    for SBIN in kolabd kolabcheckperm kolabconf kolab_bootstrap; do                    \
-      mv $RPM_BUILD_ROOT/%{l_prefix}/bin/$SBIN $RPM_BUILD_ROOT/%{l_prefix}/sbin/$SBIN; \
-      chmod 744 $RPM_BUILD_ROOT/%{l_prefix}/sbin/$SBIN;                                \
-      sed -i -e "s#/bin/$SBIN#/sbin/$SBIN#" perl-openpkg-files;                        \
-    done
-    mkdir -p $RPM_BUILD_ROOT/%{l_prefix}/etc/kolab
-    cp $RPM_BUILD_DIR/%{V_package}-%{V_version}/%{V_package}-%{V_source_tag}/data/quotawarning.txt $RPM_BUILD_ROOT/%{l_prefix}/etc/kolab
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`
 
 %files -f files