From 242338a0072949ea15984e4e62b7ad19a5d2d7c9 Mon Sep 17 00:00:00 2001
From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
Date: Fri, 17 Feb 2012 06:41:14 +0000
Subject: Enable a proper make dist

---
 .gitignore             |  3 +++
 Makefile.am            |  2 ++
 c++/Makefile.am        | 31 +++++++++++++++++++++++++++++++
 configure.ac           |  4 +++-
 libkolabxml.spec.in    | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 pykolab-format.spec.in |  0
 6 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 c++/Makefile.am
 create mode 100644 libkolabxml.spec.in
 delete mode 100644 pykolab-format.spec.in

diff --git a/.gitignore b/.gitignore
index 29a4c32..d5c7800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ Makefile.in
 ChangeLog
 autom4te.cache
 aclocal.m4
+libkolabxml-*.tar.gz
+libkolabxml-*.*/
+libkolabxml.spec
diff --git a/Makefile.am b/Makefile.am
index 529e768..e35817b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,8 @@ EXTRA_DIST = \
 	README
 
 SUBDIRS = \
+	c++ \
+	po \
 	pykolab
 
 tarball:
diff --git a/c++/Makefile.am b/c++/Makefile.am
new file mode 100644
index 0000000..c769fc9
--- /dev/null
+++ b/c++/Makefile.am
@@ -0,0 +1,31 @@
+EXTRA_DIST = \
+	autogen.sh \
+	CMakeLists.txt \
+	Makefile.am \
+	README \
+	compiled/ \
+	compiled/grammar-input-stream.cxx \
+	compiled/grammar-input-stream.hxx \
+	compiled/README \
+	compiled/XMLParserWrapper.cpp \
+	compiled/XMLParserWrapper.h \
+	compiled/xsdbin.cxx \
+	lib/ \
+	$(wildcard lib/*.cpp) \
+	$(wildcard lib/*.h) \
+	lib/CMakeLists.txt \
+	lib/DEVELOPMENT \
+	lib/kolabcontainers.i \
+	lib/kolabformat.i \
+	lib/php/ \
+	lib/php/CMakeLists.txt \
+	lib/php/test.php \
+	lib/python/ \
+	lib/python/CMakeLists.txt \
+	lib/python/test.py \
+	tests/ \
+	$(wildcard tests/*.cpp) \
+	$(wildcard tests/*.h) \
+	tests/CMakeLists.txt \
+	tests/testfiles/ \
+	$(wildcard tests/testfiles/*.xml)
diff --git a/configure.ac b/configure.ac
index 7fef081..5b1c5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pykolab-format], 0.1)
+AC_INIT([libkolabxml], 0.1)
 AC_SUBST([RELEASE], 0.1)
 
 AC_CONFIG_SRCDIR(pykolab-format.spec.in)
@@ -19,6 +19,8 @@ AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`)
 
 AC_CONFIG_FILES([
 Makefile
+c++/Makefile
+libkolabxml.spec
 po/Makefile.in
 pykolab-format.spec
 pykolab/format/Makefile
diff --git a/libkolabxml.spec.in b/libkolabxml.spec.in
new file mode 100644
index 0000000..f4da310
--- /dev/null
+++ b/libkolabxml.spec.in
@@ -0,0 +1,46 @@
+Name:           libkolabxml
+Version:        @VERSION@
+Release:        @RELEASE@%{?dist}
+Summary:        Kolab XML format collection parser library
+
+Group:          System/Libraries
+License:        LGPLv3+
+URL:            http://www.kolab.org
+Source0:        http://git.kolab.org/libkolabxml/snapshot/libkolabxml-0.1.0.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+#BuildRequires:  
+#Requires:       
+
+%description
+The libkolabxml parsing library interprets Kolab XML formats (xCal, xCard) with
+bindings for Python, PHP and other languages. The language bindings are available
+through sub-packages.
+
+%prep
+%setup -q
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc
+
+
+
+%changelog
+* Tue Feb 14 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.1.0-1
+- First package
diff --git a/pykolab-format.spec.in b/pykolab-format.spec.in
deleted file mode 100644
index e69de29..0000000
-- 
cgit v0.12