gunnar: server/perl-kolab Makefile.PL, 1.8, 1.9 perl-kolab.spec, 1.104, 1.105

cvs at kolab.org cvs at kolab.org
Fri Nov 7 19:58:10 CET 2008


Author: gunnar

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

Modified Files:
	Makefile.PL perl-kolab.spec 
Log Message:
Complete fixing the location of executables into sbin.

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.PL	10 Oct 2008 14:22:03 -0000	1.8
+++ Makefile.PL	7 Nov 2008 18:58:08 -0000	1.9
@@ -70,7 +70,7 @@
 sub MY::postamble {
     
     my $add = "bin/%: bin/%.in
-	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#' > \$@
+	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
 
 ifeq \"x\$(RPM)\" \"x\"
   RPM = \$(HOME)/bin/openpkg rpm

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- perl-kolab.spec	7 Nov 2008 14:04:19 -0000	1.104
+++ perl-kolab.spec	7 Nov 2008 18:58:08 -0000	1.105
@@ -75,13 +75,13 @@
     %{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 -F perl-openpkg-files fixate cleanup
     mkdir -p $RPM_BUILD_ROOT/%{l_prefix}/sbin
-    mv $RPM_BUILD_ROOT/%{l_prefix}/bin/kolabd $RPM_BUILD_ROOT/%{l_prefix}/sbin/kolabd
-    mv $RPM_BUILD_ROOT/%{l_prefix}/bin/kolabcheckperm $RPM_BUILD_ROOT/%{l_prefix}/sbin/kolabcheckperm
-    chmod 744 $RPM_BUILD_ROOT/%{l_prefix}/sbin/kolabd
-    chmod 744 $RPM_BUILD_ROOT/%{l_prefix}/sbin/kolabcheckperm
+    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
-    sed -i -e 's#/bin/kolabd#/sbin/kolabd#' -e 's#/bin/kolabconf#/sbin/kolabconf#' -e 's#/bin/kolab_bootstrap#/sbin/kolab_bootstrap#' -e 's#/bin/kolabcheckperm#/sbin/kolabcheckperm#' perl-openpkg-files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`
 
 %files -f files





More information about the commits mailing list