diff options
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | redhat/pgfuse.spec | 3 | ||||
| -rwxr-xr-x | tools/deploy_to_osc.sh | 24 |
3 files changed, 30 insertions, 14 deletions
@@ -1,8 +1,18 @@ all: pgfuse +# name and version of package PACKAGE_NAME = pgfuse PACKAGE_VERSION = 0.0.1 +# installation dirs +DESTDIR= +prefix=/usr + +# standard directories following FHS +execdir=$(DESTDIR)$(prefix) +bindir=$(execdir)/bin +datadir=$(execdir)/share + # for debugging CFLAGS = -Wall -Werror -g -O0 -pthread # for releasing @@ -108,6 +118,12 @@ testpgsql: testpgsql.o testpgsql.o: testpgsql.c $(CC) -c $(CFLAGS) -o testpgsql.o testpgsql.c +install: all + test -d "$(bindir)" || mkdir -p "$(bindir)" + cp pgfuse "$(bindir)" + test -d "$(datadir)/man/man1" || mkdir -p "$(datadir)/man/man1" + cp pgfuse.1 "$(datadir)/man/man1" + dist: rm -rf /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION) mkdir /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION) @@ -123,4 +139,3 @@ dist: dist-gz: dist rm -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz gzip $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar -
\ No newline at end of file diff --git a/redhat/pgfuse.spec b/redhat/pgfuse.spec index e7670f4..802da35 100644 --- a/redhat/pgfuse.spec +++ b/redhat/pgfuse.spec @@ -95,6 +95,9 @@ BuildRequires: pkgconfig BuildRequires: gcc BuildRequires: postgresql-devel >= 7.0 Requires: postgresql-libs >= 7.0 +BuildRequires: fuse-devel >= 2.6 +Requires: fuse-libs >= 2.6 +Requires: fuse >= 2.6 # Check if 'Distribution' is really set by OBS (as mentioned in bacula) %if ! 0%{?opensuse_bs} diff --git a/tools/deploy_to_osc.sh b/tools/deploy_to_osc.sh index 080bbac..2229a0e 100755 --- a/tools/deploy_to_osc.sh +++ b/tools/deploy_to_osc.sh @@ -1,18 +1,16 @@ #!/bin/sh -VERSION=0.0.1 -OSC_HOME=$HOME/home:andreas_baumann/pgfuse +PACKAGE_NAME=pgfuse +PACKAGE_VERSION=0.0.1 +OSC_HOME=$HOME/home:andreas_baumann/$PACKAGE_NAME -rm -f wolframe-$VERSION.tar.gz -make \ - WITH_SSL=1 WITH_EXPECT=1 WITH_QT=1 WITH_PAM=1 WITH_SASL=1 \ - WITH_SQLITE3=1 WITH_PGSQL=1 WITH_LUA=1 WITH_LIBXML2=1 WITH_LIBXSLT=1 \ - dist-gz -cp wolframe-$VERSION.tar.gz $OSC_HOME/wolframe_$VERSION.tar.gz -cp redhat/wolframe.spec $OSC_HOME/wolframe.spec +rm -f $PACKAGE_NAME-$PACKAGE_VERSION.tar.gz +make dist-gz +cp $PACKAGE_NAME-$PACKAGE_VERSION.tar.gz $OSC_HOME/$PACKAGE_NAME-$PACKAGE_VERSION.tar.gz +cp redhat/$PACKAGE_NAME.spec $OSC_HOME/$PACKAGE_NAME.spec -SIZE=`stat -c '%s' $OSC_HOME/wolframe_$VERSION.tar.gz` -CHKSUM=`md5sum $OSC_HOME/wolframe_$VERSION.tar.gz | cut -f 1 -d' '` +SIZE=`stat -c '%s' $OSC_HOME/$PACKAGE_NAME-$PACKAGE_VERSION.tar.gz` +CHKSUM=`md5sum $OSC_HOME/$PACKAGE_NAME-$PACKAGE_VERSION.tar.gz | cut -f 1 -d' '` -cat contrib/osc/wolframe.dsc > $OSC_HOME/wolframe.dsc -echo " $CHKSUM $SIZE wolframe_$VERSION.tar.gz" >> $OSC_HOME/wolframe.dsc +cat tools/$PACKAGE_NAME.dsc > $OSC_HOME/$PACKAGE_NAME.dsc +echo " $CHKSUM $SIZE $PACKAGE_NAME-$PACKAGE_VERSION.tar.gz" >> $OSC_HOME/$PACKAGE_NAME.dsc |