marcus: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.46, 1.47 Makefile.am, 1.39, 1.40 kolab-webadmin.spec.in, 1.17, 1.18
cvs at kolab.org
cvs at kolab.org
Thu Jun 21 19:36:17 CEST 2007
Author: marcus
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv28596
Modified Files:
ChangeLog Makefile.am kolab-webadmin.spec.in
Log Message:
* Makefile.am:
fixed kolab/issue1797 (kolab-webadmin source package missing PO files).
Added Makefile dependencies.
* kolab-webadmin.spec.in:
Removed "rm -rf $RPM_BUILD_ROOT" from the %install section as this opens
a possible race condition (see
http://lists.opensuse.org/opensuse-packaging/2007-02/msg00005.html for
more information)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ChangeLog 29 May 2007 15:12:23 -0000 1.46
+++ ChangeLog 21 Jun 2007 17:36:15 -0000 1.47
@@ -1,3 +1,17 @@
+2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
+
+ * Makefile.am:
+
+ fixed kolab/issue1797 (kolab-webadmin source package missing PO files).
+ Added Makefile dependencies.
+
+ * kolab-webadmin.spec.in:
+
+ Removed "rm -rf $RPM_BUILD_ROOT" from the %install section as this opens
+ a possible race condition (see
+ http://lists.opensuse.org/opensuse-packaging/2007-02/msg00005.html for
+ more information)
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* www/admin/domainmaintainer/domainmaintainer.php.in:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile.am 24 May 2007 12:12:15 -0000 1.39
+++ Makefile.am 21 Jun 2007 17:36:15 -0000 1.40
@@ -121,7 +121,6 @@
php/admin/templates/userdeleted.tpl \
php/admin/templates/sfdeleted.tpl \
php/admin/templates/distlistdeleted.tpl \
- php/admin/templates/page.tpl \
php/admin/templates/addresslist.tpl \
php/admin/templates/sflistall.tpl \
php/admin/templates/erfrakon.tpl \
@@ -137,7 +136,7 @@
php/admin/templates/distlistall.tpl \
php/admin/templates/kdab.tpl \
php/admin/templates/userlistall.tpl \
- php/admin/templates/userlisterror.tpl \
+ php/admin/templates/userlisterror.tpl \
php/admin/templates/service.tpl \
php/admin/templates/welcome.tpl \
php/admin/templates/systemaliasnagscreen.tpl \
@@ -149,6 +148,7 @@
phptemplatesdir = $(phpkolabdir)/templates
phptemplates_DATA = $(PHP_TEMPLATES) \
+ php/admin/templates/page.tpl \
php/admin/templates/versions.tpl
EXTRA_DIST += $(PHP_TEMPLATES)
@@ -183,11 +183,11 @@
phplocaleitdir = $(localedir)/it/LC_MESSAGES
phplocaleesdir = $(localedir)/es/LC_MESSAGES
-dist_phplocalede_DATA = $(PHP_LOCALE_DE_MO)
-dist_phplocalefr_DATA = $(PHP_LOCALE_FR_MO)
-dist_phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
-dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
-dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+dist_phplocalede_DATA = $(PHP_LOCALE_DE_PO)
+dist_phplocalefr_DATA = $(PHP_LOCALE_FR_PO)
+dist_phplocalenl_DATA = $(PHP_LOCALE_NL_PO)
+dist_phplocaleit_DATA = $(PHP_LOCALE_IT_PO)
+dist_phplocalees_DATA = $(PHP_LOCALE_ES_PO)
kwadocdir = $(pkgdocdir)/@PACKAGE@
dist_kwadoc_DATA = ChangeLog \
@@ -204,182 +204,182 @@
### new
-www/admin/addressbook/addr.php:
+www/admin/addressbook/addr.php: www/admin/addressbook/addr.php.in
@$(mkinstalldirs) www/admin/addressbook
$(do_subst) <$(srcdir)/www/admin/addressbook/addr.php.in >$@
CLEANFILES += www/admin/addressbook/addr.php
EXTRA_DIST += www/admin/addressbook/addr.php.in
-www/admin/addressbook/index.php:
+www/admin/addressbook/index.php: www/admin/addressbook/index.php.in
@$(mkinstalldirs) www/admin/addressbook
$(do_subst) <$(srcdir)/www/admin/addressbook/index.php.in >$@
CLEANFILES += www/admin/addressbook/index.php
EXTRA_DIST += www/admin/addressbook/index.php.in
-www/admin/administrator/admin.php:
+www/admin/administrator/admin.php: www/admin/administrator/admin.php.in
@$(mkinstalldirs) www/admin/administrator
$(do_subst) <$(srcdir)/www/admin/administrator/admin.php.in >$@
CLEANFILES += www/admin/administrator/admin.php
EXTRA_DIST += www/admin/administrator/admin.php.in
-www/admin/administrator/index.php:
+www/admin/administrator/index.php: www/admin/administrator/index.php.in
@$(mkinstalldirs) www/admin/administrator
$(do_subst) <$(srcdir)/www/admin/administrator/index.php.in >$@
CLEANFILES += www/admin/administrator/index.php
EXTRA_DIST += www/admin/administrator/index.php.in
-www/admin/distributionlist/index.php:
+www/admin/distributionlist/index.php: www/admin/distributionlist/index.php.in
@$(mkinstalldirs) www/admin/distributionlist
$(do_subst) <$(srcdir)/www/admin/distributionlist/index.php.in >$@
CLEANFILES += www/admin/distributionlist/index.php
EXTRA_DIST += www/admin/distributionlist/index.php.in
-www/admin/distributionlist/list.php:
+www/admin/distributionlist/list.php: www/admin/distributionlist/list.php.in
@$(mkinstalldirs) www/admin/distributionlist
$(do_subst) <$(srcdir)/www/admin/distributionlist/list.php.in >$@
CLEANFILES += www/admin/distributionlist/list.php
EXTRA_DIST += www/admin/distributionlist/list.php.in
-www/admin/domainmaintainer/domainmaintainer.php:
+www/admin/domainmaintainer/domainmaintainer.php: www/admin/domainmaintainer/domainmaintainer.php.in
@$(mkinstalldirs) www/admin/domainmaintainer
$(do_subst) <$(srcdir)/www/admin/domainmaintainer/domainmaintainer.php.in >$@
CLEANFILES += www/admin/domainmaintainer/domainmaintainer.php
EXTRA_DIST += www/admin/domainmaintainer/domainmaintainer.php.in
-www/admin/domainmaintainer/index.php:
+www/admin/domainmaintainer/index.php: www/admin/domainmaintainer/index.php.in
@$(mkinstalldirs) www/admin/domainmaintainer
$(do_subst) <$(srcdir)/www/admin/domainmaintainer/index.php.in >$@
CLEANFILES += www/admin/domainmaintainer/index.php
EXTRA_DIST += www/admin/domainmaintainer/index.php.in
-www/admin/index.php:
+www/admin/index.php: www/admin/index.php.in
@$(mkinstalldirs) www/admin
$(do_subst) <$(srcdir)/www/admin/index.php.in >$@
CLEANFILES += www/admin/index.php
EXTRA_DIST += www/admin/index.php.in
-www/admin/kolab/codefusion.php:
+www/admin/kolab/codefusion.php: www/admin/kolab/codefusion.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/codefusion.php.in >$@
CLEANFILES += www/admin/kolab/codefusion.php
EXTRA_DIST += www/admin/kolab/codefusion.php.in
-www/admin/kolab/erfrakon.php:
+www/admin/kolab/erfrakon.php: www/admin/kolab/erfrakon.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/erfrakon.php.in >$@
CLEANFILES += www/admin/kolab/erfrakon.php
EXTRA_DIST += www/admin/kolab/erfrakon.php.in
-www/admin/kolab/index.php:
+www/admin/kolab/index.php: www/admin/kolab/index.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/index.php.in >$@
CLEANFILES += www/admin/kolab/index.php
EXTRA_DIST += www/admin/kolab/index.php.in
-www/admin/kolab/intevation.php:
+www/admin/kolab/intevation.php: www/admin/kolab/intevation.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/intevation.php.in >$@
CLEANFILES += www/admin/kolab/intevation.php
EXTRA_DIST += www/admin/kolab/intevation.php.in
-www/admin/kolab/kdab.php:
+www/admin/kolab/kdab.php: www/admin/kolab/kdab.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/kdab.php.in >$@
CLEANFILES += www/admin/kolab/kdab.php
EXTRA_DIST += www/admin/kolab/kdab.php.in
-www/admin/kolab/kde.php:
+www/admin/kolab/kde.php: www/admin/kolab/kde.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/kde.php.in >$@
CLEANFILES += www/admin/kolab/kde.php
EXTRA_DIST += www/admin/kolab/kde.php.in
-www/admin/maintainer/index.php:
+www/admin/maintainer/index.php: www/admin/maintainer/index.php.in
@$(mkinstalldirs) www/admin/maintainer
$(do_subst) <$(srcdir)/www/admin/maintainer/index.php.in >$@
CLEANFILES += www/admin/maintainer/index.php
EXTRA_DIST += www/admin/maintainer/index.php.in
-www/admin/maintainer/maintainer.php:
+www/admin/maintainer/maintainer.php: www/admin/maintainer/maintainer.php.in
@$(mkinstalldirs) www/admin/maintainer
$(do_subst) <$(srcdir)/www/admin/maintainer/maintainer.php.in >$@
CLEANFILES += www/admin/maintainer/maintainer.php
EXTRA_DIST += www/admin/maintainer/maintainer.php.in
-www/admin/service/index.php:
+www/admin/service/index.php: www/admin/service/index.php.in
@$(mkinstalldirs) www/admin/service
$(do_subst) <$(srcdir)/www/admin/service/index.php.in >$@
CLEANFILES += www/admin/service/index.php
EXTRA_DIST += www/admin/service/index.php.in
-www/admin/sharedfolder/index.php:
+www/admin/sharedfolder/index.php: www/admin/sharedfolder/index.php.in
@$(mkinstalldirs) www/admin/sharedfolder
$(do_subst) <$(srcdir)/www/admin/sharedfolder/index.php.in >$@
CLEANFILES += www/admin/sharedfolder/index.php
EXTRA_DIST += www/admin/sharedfolder/index.php.in
-www/admin/sharedfolder/sf.php:
+www/admin/sharedfolder/sf.php: www/admin/sharedfolder/sf.php.in
@$(mkinstalldirs) www/admin/sharedfolder
$(do_subst) <$(srcdir)/www/admin/sharedfolder/sf.php.in >$@
CLEANFILES += www/admin/sharedfolder/sf.php
EXTRA_DIST += www/admin/sharedfolder/sf.php.in
-www/admin/user/deliver.php:
+www/admin/user/deliver.php: www/admin/user/deliver.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/deliver.php.in >$@
CLEANFILES += www/admin/user/deliver.php
EXTRA_DIST += www/admin/user/deliver.php.in
-www/admin/user/forward.php:
+www/admin/user/forward.php: www/admin/user/forward.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/forward.php.in >$@
CLEANFILES += www/admin/user/forward.php
EXTRA_DIST += www/admin/user/forward.php.in
-www/admin/user/index.php:
+www/admin/user/index.php: www/admin/user/index.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/index.php.in >$@
CLEANFILES += www/admin/user/index.php
EXTRA_DIST += www/admin/user/index.php.in
-www/admin/user/vacation.php:
+www/admin/user/vacation.php: www/admin/user/vacation.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/vacation.php.in >$@
CLEANFILES += www/admin/user/vacation.php
EXTRA_DIST += www/admin/user/vacation.php.in
###
-php/admin/include/auth.class.php:
+php/admin/include/auth.class.php: php/admin/include/auth.class.php.in
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/auth.class.php.in >$@
CLEANFILES += php/admin/include/auth.class.php
EXTRA_DIST += php/admin/include/auth.class.php.in
-php/admin/include/config.php: Makefile php/admin/include/config.php.in
+php/admin/include/config.php: php/admin/include/config.php.in
$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@
CLEANFILES += php/admin/include/config.php
EXTRA_DIST += php/admin/include/config.php.in
-php/admin/include/headers.php:
+php/admin/include/headers.php: php/admin/include/headers.php.in
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/headers.php.in >$@
CLEANFILES += php/admin/include/headers.php
EXTRA_DIST += php/admin/include/headers.php.in
-php/admin/include/mysmarty.php:
+php/admin/include/mysmarty.php: php/admin/include/mysmarty.php.in
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/mysmarty.php.in >$@
CLEANFILES += php/admin/include/mysmarty.php
EXTRA_DIST += php/admin/include/mysmarty.php.in
-php/admin/templates/page.tpl:
+php/admin/templates/page.tpl: php/admin/templates/page.tpl.in
@$(mkinstalldirs) php/admin/templates
$(do_subst) <$(srcdir)/php/admin/templates/page.tpl.in >$@
CLEANFILES += php/admin/templates/page.tpl
EXTRA_DIST += php/admin/templates/page.tpl.in
-php/admin/templates/versions.tpl:
+php/admin/templates/versions.tpl: php/admin/templates/versions.tpl.in
@$(mkinstalldirs) php/admin/templates
if OPENPKG
sed 's/^@OPENPKG@//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
@@ -389,19 +389,19 @@
CLEANFILES += php/admin/templates/versions.tpl
EXTRA_DIST += php/admin/templates/versions.tpl.in
-www/admin/logout.php:
+www/admin/logout.php: www/admin/logout.php.in
@$(mkinstalldirs) www/admin
$(do_subst) <$(srcdir)/www/admin/logout.php.in >$@
CLEANFILES += www/admin/logout.php
EXTRA_DIST += www/admin/logout.php.in
-www/admin/user/user.php:
+www/admin/user/user.php: www/admin/user/user.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/user.php.in >$@
CLEANFILES += www/admin/user/user.php
EXTRA_DIST += www/admin/user/user.php.in
-www/admin/kolab/versions.php:
+www/admin/kolab/versions.php: www/admin/kolab/versions.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/versions.php.in >$@
CLEANFILES += www/admin/kolab/versions.php
Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab-webadmin.spec.in 20 Apr 2007 14:07:54 -0000 1.17
+++ kolab-webadmin.spec.in 21 Jun 2007 17:36:15 -0000 1.18
@@ -62,7 +62,6 @@
./configure -prefix=%{l_prefix} --with-dist=kolab
%install
- rm -rf $RPM_BUILD_ROOT
# install package
%{l_make} %{l_mflags} install \
More information about the commits
mailing list