richard: server/perl-kolab AUTHORS, NONE, 1.1 ChangeLog, NONE, 1.1 NEWS, NONE, 1.1 bootstrap, NONE, 1.1 configure.ac, NONE, 1.1 Makefile.am, 1.6, 1.7 Makefile.cvs, 1.2, 1.3 perl-kolab.spec.in, 1.27, 1.28
cvs at intevation.de
cvs at intevation.de
Sat Dec 17 22:45:34 CET 2005
- Previous message: richard: server/kolabd/kolabd ChangeLog, 1.11, 1.12 Makefile.am, 1.7, 1.8 configure.ac, 1.3, 1.4
- Next message: richard: server/perl-kolab/Kolab Kolab.pm.in, NONE, 1.1 Makefile.PL, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: richard
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv16585
Modified Files:
Makefile.am Makefile.cvs perl-kolab.spec.in
Added Files:
AUTHORS ChangeLog NEWS bootstrap configure.ac
Log Message:
perl-kolab is now autoconfiscated using the regular autoconf
and automake machinery. Discarded autoperl machinery.
Much work has been done by Marcus Huwe.
--- NEW FILE: AUTHORS ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ChangeLog ---
2005-12-17 Richard Bos <richard at radoeka.nl>
* NEWS: added
* Makefile.cvs,
perl-kolab.spec.in: updated so the build completes
with the new autoconfiscated perl-kolab
2005-12-17 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* bootstrap: added
* ChangeLog: added
* Kolab/Kolab.pm,
Kolab-Conf/Conf.pm,
Kolab-DirServ/DirServ.pm,
Kolab-LDAP/LDAP.pm,
Kolab-LDAP-Backend-slurpd/slurpd.pm,
Kolab-Mailer/Mailer.pm: are working now with the updated
kolabd/kolabd/dist_conf file
* Kolab/Makefile.am,
Kolab-Mailer/Makefile.am,
Kolab-Conf/Makefile.am,
Kolab-LDAP/Makefile.am,
Kolab-Util/Makefile.am,
Kolab-Cyrus/Makefile.am,
Kolab-LDAP-Backend/Makefile.am,
Kolab-LDAP-Backend-ad/Makefile.am,
Kolab-LDAP-Backend-slurpd/Makefile.am,
Kolab-DirServ/Makefile.am,
Kolab-LDAP-Backend-dirservd/Makefile.am,
Makefile.am: are removed
* Kolab/Makefile.PL,
Kolab-Mailer/Makefile.PL,
Kolab-Conf/Makefile.PL,
Kolab-LDAP/Makefile.PL,
Kolab-Util/Makefile.PL,
Kolab-Cyrus/Makefile.PL,
Kolab-LDAP-Backend/Makefile.PL,
Kolab-LDAP-Backend-ad/Makefile.PL,
Kolab-LDAP-Backend-slurpd/Makefile.PL,
Kolab-DirServ/Makefile.PL,
Kolab-LDAP-Backend-dirservd/Makefile.PL: are removed
--- NEW FILE: NEWS ---
--- NEW FILE: bootstrap ---
touch README
cp -R ../kolabd/kolabd/dist_conf .
autoreconf -f -i
--- NEW FILE: configure.ac ---
AC_PREREQ(2.59)
m4_define(_VERSION,5.8.7)
AC_INIT([perl-kolab],[_VERSION],[kolab-devel at kolab.org])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([gnu] [1.7] [dist-bzip2])
AC_PREFIX_DEFAULT([/usr])
common=dist_conf/common
AC_SUBST_FILE(common)
AC_ARG_ENABLE([dist],
[AC_HELP_STRING([--enable-dist=DIST],
[distribution target (default: openpkg)])],
[distribution=$srcdir/dist_conf/$enable_dist],
[distribution=$srcdir/dist_conf/kolab])
AC_SUBST_FILE(distribution)
# Checks for libraries.
# Checks for header files.
# Checks for typedefs, structures, and compiler characteristics.
# Checks for library functions.
# Build date for spec file
spec_build_date=`date '+%Y%m%d'`
AC_SUBST(spec_build_date)
AC_CONFIG_FILES([
Makefile
perl-kolab.spec
])
AC_OUTPUT
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am 22 Jul 2005 22:36:14 -0000 1.6
+++ Makefile.am 17 Dec 2005 21:45:32 -0000 1.7
@@ -1,29 +1,82 @@
-PROGRAM = perl-kolab
-VERSION = 5.8.7
+EXTRA_DIST =
+CLEANFILES =
-SUBDIRS = \
- Kolab \
- Kolab-Conf \
- Kolab-Cyrus \
- Kolab-DirServ \
- Kolab-LDAP \
- Kolab-LDAP-Backend \
- Kolab-LDAP-Backend-ad \
- Kolab-LDAP-Backend-dirservd \
- Kolab-LDAP-Backend-slurpd \
- Kolab-Mailer \
- Kolab-Util
+ at distribution@
+ at common@
+noinst_HEADERS = @PACKAGE at .spec
-EXTRA_DIST = perl-kolab.spec.in dist_conf/$(dist)
+perl_kolabdir = $(perllib)
+perl_kolab_DATA = Kolab/Kolab.pm
-AC_CONFIG_FILES = perl-kolab.spec
+perl_modulesdir = $(perllib)/Kolab
+perl_modules_DATA = Kolab-Conf/Conf.pm \
+ Kolab-Cyrus/Cyrus.pm \
+ Kolab-DirServ/DirServ.pm \
+ Kolab-LDAP/LDAP.pm \
+ Kolab-Mailer/Mailer.pm \
+ Kolab-Util/Util.pm
-# own Variables and default values:
+EXTRA_DIST += Kolab-Cyrus/Cyrus.pm \
+ Kolab-Util/Util.pm
-dist_ARG = kolab
-dist_ARG_HELP = dist_conf file
-# for including the ../dist_conf/kolab file
+backenddir = $(perl_modulesdir)/LDAP
+dist_backend_DATA = Kolab-LDAP-Backend/Backend.pm
-#include "dist_conf/$(dist)"
+
+LDAP_module_FILES = Kolab-LDAP-Backend-ad/ad.pm \
+ Kolab-LDAP-Backend-dirservd/dirservd.pm \
+ Kolab-LDAP-Backend-slurpd/slurpd.pm
+
+LDAP_moduledir = $(backenddir)/Backend
+LDAP_module_DATA = $(LDAP_module_FILES)
+
+EXTRA_DIST += Kolab-LDAP-Backend/Backend.pm \
+ Kolab-LDAP-Backend-ad/ad.pm \
+ Kolab-LDAP-Backend-dirservd/dirservd.pm
+
+pkdocdir = $(pkgdocdir)/perl-kolab
+dist_pkdoc_DATA = ChangeLog NEWS AUTHORS COPYING
+EXTRA_DIST += INSTALL
+
+Kolab/Kolab.pm:
+ @$(mkinstalldirs) Kolab
+ $(do_subst) <$(srcdir)/Kolab/Kolab.pm.in > $@
+CLEANFILES += Kolab/Kolab.pm
+EXTRA_DIST += Kolab/Kolab.pm.in
+
+Kolab-Conf/Conf.pm:
+ @$(mkinstalldirs) Kolab-Conf
+ $(do_subst) <$(srcdir)/Kolab-Conf/Conf.pm.in > $@
+CLEANFILES += Kolab-Conf/Conf.pm
+EXTRA_DIST += Kolab-Conf/Conf.pm.in
+
+Kolab-DirServ/DirServ.pm:
+ @$(mkinstalldirs) Kolab-DirServ
+ $(do_subst) <$(srcdir)/Kolab-DirServ/DirServ.pm.in > $@
+CLEANFILES += Kolab-DirServ/DirServ.pm
+EXTRA_DIST += Kolab-DirServ/DirServ.pm.in
+
+Kolab-LDAP/LDAP.pm:
+ @$(mkinstalldirs) Kolab-LDAP
+ $(do_subst) <$(srcdir)/Kolab-LDAP/LDAP.pm.in > $@
+CLEANFILES += Kolab-LDAP/LDAP.pm
+EXTRA_DIST += Kolab-LDAP/LDAP.pm.in
+
+Kolab-LDAP-Backend-slurpd/slurpd.pm:
+ @$(mkinstalldirs) Kolab-LDAP-Backend-slurpd
+ $(do_subst) <$(srcdir)/Kolab-LDAP-Backend-slurpd/slurpd.pm.in > $@
+CLEANFILES += Kolab-LDAP-Backend-slurpd/slurpd.pm
+EXTRA_DIST += Kolab-LDAP-Backend-slurpd/slurpd.pm.in
+
+Kolab-Mailer/Mailer.pm:
+ @$(mkinstalldirs) Kolab-Mailer
+ $(do_subst) <$(srcdir)/Kolab-Mailer/Mailer.pm.in > $@
+CLEANFILES += Kolab-Mailer/Mailer.pm
+EXTRA_DIST += Kolab-Mailer/Mailer.pm.in
+
+EXTRA_DIST += dist_conf
+CLEANFILES += perl-kolab.spec
+
+install-data-hook:
Index: Makefile.cvs
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.cvs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.cvs 15 Jul 2005 01:01:33 -0000 1.2
+++ Makefile.cvs 17 Dec 2005 21:45:32 -0000 1.3
@@ -8,12 +8,12 @@
KOLABRPMSRC = /kolab/RPM/SRC
endif
-VERSION:=`grep 'VERSION' $(PWD)/Makefile.am|sed 's/VERSION *= *\(.*\)/\1/'`
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
all:
test -d $(KOLABRPMSRC)/$(RPMNAME) || mkdir $(KOLABRPMSRC)/$(RPMNAME)
- ./configure --prefix=/kolab --dist=kolab \
- && make dist && mv $(RPMNAME)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(RPMNAME)
+ ./bootstrap && ./configure --prefix=/kolab \
+ && make distcheck && mv $(RPMNAME)-$(VERSION).tar.bz2 $(KOLABRPMSRC)/$(RPMNAME)
cp $(RPMNAME).spec $(KOLABRPMSRC)/$(RPMNAME)/
cd $(KOLABRPMSRC)/$(RPMNAME) && $(RPM) -ba $(RPMNAME).spec --define 'kolab_version CVS'
binary:
Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- perl-kolab.spec.in 30 Nov 2005 03:35:45 -0000 1.27
+++ perl-kolab.spec.in 17 Dec 2005 21:45:32 -0000 1.28
@@ -27,7 +27,7 @@
# package information
-Name: @PROGRAM@
+Name: @PACKAGE@
Summary: Perl Modules for use with the Kolab server
URL: http://www.kolab.org
Vendor: Code Fusion, Klaraelvdalens Datakonsult AB
@@ -40,12 +40,13 @@
Release: 20051130
# list of sources
-Source0: perl-kolab- at VERSION@.tar.gz
+Source0: perl-kolab-%{version}.tar.bz2
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.0, perl >= @VERSION@, perl-openpkg >= @VERSION@
+# BuildPreReq: OpenPKG, openpkg >= 2.0, perl >= @VERSION@, perl-openpkg >= @VERSION@
+BuildPreReq: OpenPKG, openpkg >= 2.0
PreReq: OpenPKG, openpkg >= 2.2.0, perl >= @VERSION@, perl-openpkg >= @VERSION@, perl-db, perl-mail, perl-ldap
AutoReq: no
AutoReqProv: no
@@ -61,9 +62,10 @@
%build
# Notice: %{perl_sitearch} does not work,
# it picks up the host system's perl
- %{configure} --prefix=%{l_prefix} \
- --includedir=%(eval "`%{l_prefix}/bin/perl -V:installsitearch`"; echo $installsitearch) \
- --dist=kolab
+# %{configure} --prefix=%{l_prefix} \
+# --includedir=%(eval "`%{l_prefix}/bin/perl -V:installsitearch`"; echo $installsitearch) \
+# --dist=kolab
+ %{configure} --prefix=%{l_prefix} --enable-dist=kolab
make
%install
- Previous message: richard: server/kolabd/kolabd ChangeLog, 1.11, 1.12 Makefile.am, 1.7, 1.8 configure.ac, 1.3, 1.4
- Next message: richard: server/perl-kolab/Kolab Kolab.pm.in, NONE, 1.1 Makefile.PL, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list