updated and integrated OBS build files

16 files changed, 158 insertions, 68 deletions

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index ef676da..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-pgfuse (0.0.1-1) unstable; urgency=low
-
-  * Initial release
-
- -- Andreas Baumann <mail@andreasbaumann.cc>  Fri, 20 Apr 2012 17:48:00 +0200
diff --git a/dist/archlinux/PKGBUILD b/dist/archlinux/PKGBUILD
new file mode 100644
index 0000000..7542bf8
--- /dev/null
+++ b/dist/archlinux/PKGBUILD
@@ -0,0 +1,29 @@
+# Contributor: Andreas Baumann <mail@andreasbaumann.cc>
+# Maintainer: Andreas Baumann <mail@andreasbaumann.cc>
+
+pkgname=pgfuse
+_mainpkgver=0.0.2
+pkgver=${_mainpkgver}
+pkgrel=1
+pkgdesc="FUSE-based file system with a PostgreSQL storage backend"
+url="https://github.com/andreasbaumann/pgfuse"
+license=('GPL3')
+arch=('i686' 'x86_64')
+depends=('fuse' 'postgresql-libs')
+makedepends=('pkg-config')
+source=("${pkgname}-${_mainpkgver}.tar.gz")
+md5sums=('ed6fb841d79425806cf059c9561b799e')
+
+build() {
+	cd ${srcdir}/${pkgname}-${_mainpkgver}
+
+	msg "Building..."
+	make
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${_mainpkgver}
+
+	msg "Installing.."
+	make DESTDIR=$pkgdir install
+}
diff --git a/debian/README.source b/dist/debian/README.source
index 3a40965..3a40965 100644
--- a/debian/README.source
+++ b/dist/debian/README.source
diff --git a/dist/debian/changelog b/dist/debian/changelog
new file mode 100644
index 0000000..90ee4df
--- /dev/null
+++ b/dist/debian/changelog
@@ -0,0 +1,11 @@
+pgfuse (0.0.2-1) unstable; urgency=low
+
+  * release 0.0.2
+
+ -- Andreas Baumann <mail@andreasbaumann.cc>  Sat, 27 Aug 2015 11:30:40 +0200
+
+pgfuse (0.0.1-1) unstable; urgency=low
+
+  * preliminary release
+
+ -- Andreas Baumann <mail@andreasbaumann.cc>  Fri, 20 Apr 2012 17:48:00 +0200
diff --git a/debian/compat b/dist/debian/compat
index 7f8f011..7f8f011 100644
--- a/debian/compat
+++ b/dist/debian/compat
diff --git a/debian/conffiles b/dist/debian/conffiles
index e69de29..e69de29 100644
--- a/debian/conffiles
+++ b/dist/debian/conffiles
diff --git a/debian/control b/dist/debian/control
index 7e7d999..7e7d999 100644
--- a/debian/control
+++ b/dist/debian/control
diff --git a/debian/copyright b/dist/debian/copyright
index e5d8eec..e5d8eec 100644
--- a/debian/copyright
+++ b/dist/debian/copyright
diff --git a/debian/docs b/dist/debian/docs
index 44e876e..44e876e 100644
--- a/debian/docs
+++ b/dist/debian/docs
diff --git a/debian/postinst b/dist/debian/postinst
index a88e898..a88e898 100644
--- a/debian/postinst
+++ b/dist/debian/postinst
diff --git a/debian/postrm b/dist/debian/postrm
index ccd81f0..ccd81f0 100644
--- a/debian/postrm
+++ b/dist/debian/postrm
diff --git a/debian/prerm b/dist/debian/prerm
index 7da4645..7da4645 100644
--- a/debian/prerm
+++ b/dist/debian/prerm
diff --git a/debian/rules b/dist/debian/rules
index 6847ed7..6847ed7 100755
--- a/debian/rules
+++ b/dist/debian/rules
diff --git a/debian/shlibs b/dist/debian/shlibs
index e69de29..e69de29 100644
--- a/debian/shlibs
+++ b/dist/debian/shlibs
diff --git a/dist/obs/deploy_to_obs.sh b/dist/obs/deploy_to_obs.sh
new file mode 100755
index 0000000..c7f9082
--- /dev/null
+++ b/dist/obs/deploy_to_obs.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+PACKAGE_NAME=pgfuse
+PACKAGE_VERSION=0.0.2
+OSC_HOME=$HOME/home:andreas_baumann/$PACKAGE_NAME
+
+rm -f ${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz
+cmake .
+make dist-gz
+
+# git commit count since last tagging is used for a build number of
+# the package to make individual builds distinguishable
+
+GIT_COMMIT_COUNT=`git describe --long --tags | cut -f 2 -d -`
+
+# Redhat/SuSE
+
+cp ${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}.tar.gz
+cp dist/redhat/$PACKAGE_NAME.spec $OSC_HOME/$PACKAGE_NAME.spec
+sed -i "s/Version:.*/Version: %{main_version}.${GIT_COMMIT_COUNT}/" $OSC_HOME/$PACKAGE_NAME.spec
+
+# Debian/Ubuntu
+
+# generic version for most distros
+
+cp ${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}.orig.tar.gz
+
+SIZE=`stat -c '%s' $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}.orig.tar.gz`
+CHKSUM=`md5sum $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}.orig.tar.gz | cut -f 1 -d' '`
+
+cp dist/obs/$PACKAGE_NAME.dsc $OSC_HOME/$PACKAGE_NAME.dsc
+echo " $CHKSUM $SIZE ${PACKAGE_NAME}_${PACKAGE_VERSION}.orig.tar.gz" >> $OSC_HOME/$PACKAGE_NAME.dsc
+
+TMPDIR=/tmp
+rm -f $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}.debian.tar.gz
+rm -rf $TMPDIR/debian
+cp -r dist/debian $TMPDIR/.
+sed -i "s/${PACKAGE_NAME} (\([0-9.]*\)-\([0-9]*\))/${PACKAGE_NAME} (\1-$GIT_COMMIT_COUNT)/" $TMPDIR/debian/changelog
+OLDDIR=$PWD
+cd $TMPDIR
+tar zcf $TMPDIR/${PACKAGE_NAME}_${PACKAGE_VERSION}.debian.tar.gz debian
+cd $OLDDIR
+mv -f $TMPDIR/${PACKAGE_NAME}_${PACKAGE_VERSION}.debian.tar.gz $OSC_HOME/.
+DEBIAN_SIZE=`stat -c '%s' $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}.debian.tar.gz`
+DEBIAN_CHKSUM=`md5sum  $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}.debian.tar.gz | cut -f 1 -d' '`
+echo " $DEBIAN_CHKSUM $DEBIAN_SIZE ${PACKAGE_NAME}_${PACKAGE_VERSION}.debian.tar.gz" >> $OSC_HOME/$PACKAGE_NAME.dsc
+
+# specific versions (older distros)
+
+for i in `ls dist/obs/$PACKAGE_NAME-*.dsc`; do
+	dsc=`basename $i`
+	cp dist/obs/$dsc $OSC_HOME/$dsc
+
+	echo " $CHKSUM $SIZE ${PACKAGE_NAME}_${PACKAGE_VERSION}.orig.tar.gz" >> $OSC_HOME/$dsc
+
+	OS_ORIG=`echo $i | cut -f 2 -d '-' | sed 's/\.dsc$//'`
+	OS=`echo $i | cut -f 2 -d '-' | sed 's/\.dsc$//' | tr -d '_'`
+	
+	rm -rf $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}-$OS.debian.tar.gz
+	rm -rf $TMPDIR/debian
+	cp -a dist/debian $TMPDIR/.
+	test -f dist/obs/control-$OS_ORIG && cp -a dist/obs/control-$OS_ORIG $TMPDIR/debian/control
+	test -f dist/obs/rules-$OS_ORIG && cp -a dist/obs/rules-$OS_ORIG $TMPDIR/debian/rules
+	sed -i "s/${PACKAGE_NAME} (\([0-9.]*\)-\([0-9]*\))/${PACKAGE_NAME} (\1-$GIT_COMMIT_COUNT)/" $TMPDIR/debian/changelog
+
+	OLDDIR=$PWD
+	cd $TMPDIR
+	tar zcf $TMPDIR/${PACKAGE_NAME}_${PACKAGE_VERSION}-$OS.debian.tar.gz debian
+	cd $OLDDIR
+	mv -f $TMPDIR/${PACKAGE_NAME}_${PACKAGE_VERSION}-$OS.debian.tar.gz $OSC_HOME/.
+	DEBIAN_SIZE=`stat -c '%s' $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}-$OS.debian.tar.gz`
+	DEBIAN_CHKSUM=`md5sum $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}-$OS.debian.tar.gz | cut -f 1 -d' '`
+	echo " $DEBIAN_CHKSUM $DEBIAN_SIZE ${PACKAGE_NAME}_${PACKAGE_VERSION}-$OS.debian.tar.gz" >> $OSC_HOME/$dsc
+done
+
+# Archlinux
+
+cp ${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz $OSC_HOME/${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz
+
+CHKSUM=`md5sum $OSC_HOME/${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz  | cut -f 1 -d' '`
+
+cat dist/archlinux/PKGBUILD > $OSC_HOME/PKGBUILD
+echo "md5sums=('$CHKSUM')" >> $OSC_HOME/PKGBUILD
+
+sed -i "s/^pkgver=.*/pkgver=\${_mainpkgver}.r${GIT_COMMIT_COUNT}/" $OSC_HOME/PKGBUILD
diff --git a/redhat/pgfuse.spec b/dist/redhat/pgfuse.spec
index aa96bd5..e0f9842 100644
--- a/redhat/pgfuse.spec
+++ b/dist/redhat/pgfuse.spec
@@ -63,90 +63,57 @@
 %endif
 
 %define fedora 0
-%define fc14 0
-%if 0%{?fedora_version} == 14
-%define dist fc14
-%define fc14 1
-%define fedora 1
-%endif
-%define fc15 0  
-%if 0%{?fedora_version} == 15
-%define dist fc15
-%define fc15 1
-%define fedora 1
-%endif
-%define fc16 0  
-%if 0%{?fedora_version} == 16
-%define dist fc16
-%define fc16 1   
-%define fedora 1
-%endif
-%define fc17 0  
-%if 0%{?fedora_version} == 17
-%define dist fc17
-%define fc17 1
-%define fedora 1
-%endif
-%define fc18 0  
-%if 0%{?fedora_version} == 18
-%define dist fc18
-%define fc18 1
-%define fedora 1
-%endif
-%define fc19 0  
-%if 0%{?fedora_version} == 19
-%define dist fc19
-%define fc19 1
-%define fedora 1
-%endif
-%define fc20 0  
-%if 0%{?fedora_version} == 20
-%define dist fc20
-%define fc20 1
-%define fedora 1
-%endif
-%define fc21 0  
+%define fc21 0
+%define fc22 0
 %if 0%{?fedora_version} == 21
 %define dist fc21
 %define fc21 1
 %define fedora 1
 %endif
+%if 0%{?fedora_version} == 22
+%define dist fc22
+%define fc22 1
+%define fedora 1
+%endif
 
 %define suse 0
-%define osu114 0
-%define osu121 0
-%define osu122 0
 %define osu131 0
-%if 0%{?suse_version} == 1140
-%define dist osu114
-%define osu114 1
-%define suse 1
-%endif
-%if 0%{?suse_version} == 1210
-%define dist osu121
-%define osu121 1
+%define osu132 0
+%define osufactory 0
+%if 0%{?suse_version} == 1310
+%define dist osu131
+%define osu131 1
 %define suse 1
 %endif
-%if 0%{?suse_version} >= 1220
-%define dist osu122
-%define osu122 1
+%if 0%{?suse_version} == 1320
+%define dist osu132
+%define osu132 1
 %define suse 1
 %endif
-%if 0%{?suse_version} >= 1310
-%define dist osu131
-%define osu131 1
+%if 0%{?suse_version} > 1320
+%define dist osufactory
+%define osufactory 1
 %define suse 1
 %endif
 
 %define sles 0
-%if 0%{?sles_version} == 11
+%define sles11 0
+%define sles12 0
+%if 0%{?suse_version} == 1110
 %define dist sle11
+%define sles11 1
+%define sles 1
+%endif
+%if 0%{?suse_version} == 1315 
+%define dist sle12
+%define sles12 1
 %define sles 1
 %endif
 
 Summary: Stores files in a PostgreSQL database using the FUSE API
 Name: pgfuse
-Version: 0.0.1
+%define main_version 0.0.2
+Version: %{main_version}
 Release: 0.1
 License: GPLv3
 Group: System/Filesystems
@@ -223,5 +190,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}-%{version}/schema.sql
 
 %changelog
-* Fri Apr 20 2012 Andreas Baumann <mail@andreasbaumann.cc> 0.0.1-0.1
+* Sat Aug 27 2015 Andreas Baumann <abaumann@yahoo.com> 0.0.2-0.1
+- release 0.0.2
+
+* Fri Apr 20 2012 Andreas Baumann <abaumann@yahoo.com> 0.0.1-0.1
 - preliminary release