diff options
| -rw-r--r-- | Makefile.am | 36 | ||||
| -rw-r--r-- | autoversion.in | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | credmonger.spec | 2 |
4 files changed, 20 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 344005b..c38fbdd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,32 +1,30 @@ EXTRA_DIST = credmonger.spec LICENSE SUBDIRS = src -VERSION=$(shell rpm -q --specfile $(top_srcdir)/credmonger.spec --qf '%{version}\n' | head -n1) -RELEASE=$(shell rpm -q --specfile $(top_srcdir)/credmonger.spec --qf '%{release}\n' | head -n1) -GITTAG=credmonger-$(shell rpm -q --specfile $(top_srcdir)/credmonger.spec --qf '%{version}\n' --define 'dist %{nil}' | head -n1) -distdir=$(GITTAG) +VERSION=$(shell grep ^Version: $(top_srcdir)/credmonger.spec | awk '{print $$NF}') +RELEASE=$(shell rpm -q --specfile $(top_srcdir)/credmonger.spec | awk '{print $$NF}') +TAG=credmonger-$(VERSION) +distdir=$(PACKAGE)-$(VERSION) -tag: - git tag $(GITTAG) +compare_versions: + test $(VERSION) = `cat autoversion` +tag: compare_versions + git tag $(TAG) -force-tag: - git tag -f $(GITTAG) +force-tag: compare_versions + git tag -f $(TAG) -ORIGIN=$(shell git config remote.origin.url 2> /dev/null || /bin/pwd) +REPOSITORY=$(shell git config remote.origin.url 2> /dev/null || /bin/pwd) ARCHIVEOUTDIR=$(shell cd $(top_srcdir) && pwd) -local-archive: - $(MAKE) archive ORIGIN=$(ARCHIVEOUTDIR) - archive: - repo=`pwd`; \ - tmpdir=`mktemp -d /tmp/make_archive_XXXXXX`; \ + tmpdir=`mktemp -d /tmp/make_archive_XXXXXX`;\ if test -d "$$tmpdir" ; then \ - git clone $(ORIGIN) $$tmpdir/credmonger;\ - cd $$tmpdir/credmonger;\ - git checkout $(GITTAG);\ - ./autogen.maint;\ - ./configure;\ + cd $$tmpdir;\ + git clone $(REPOSITORY);\ + cd $$tmpdir/$(PACKAGE);\ + git checkout $(TAG);\ + ./autogen;\ make dist;\ mkdir -p $$tmpdir/rpm-build-top;\ rpmbuild \ diff --git a/autoversion.in b/autoversion.in new file mode 100644 index 0000000..a24f987 --- /dev/null +++ b/autoversion.in @@ -0,0 +1 @@ +@PACKAGE_VERSION@ diff --git a/configure.ac b/configure.ac index 5f96e92..a1c48b4 100644 --- a/configure.ac +++ b/configure.ac @@ -44,4 +44,4 @@ mysysconfdir=`eval echo "$mysysconfdir" | sed s,^NONE,"$ac_default_prefix",` myconfigdir="$mysysconfdir"/${PACKAGE_NAME}.d AC_DEFINE_UNQUOTED(CONFIG_DIR,"$myconfigdir",[Define to the location of the daemon's configuration files.]) AC_SUBST(myconfigdir) -AC_OUTPUT(Makefile src/Makefile src/credmonger.8) +AC_OUTPUT(autoversion Makefile src/Makefile src/credmonger.8) diff --git a/credmonger.spec b/credmonger.spec index 6ef2ef3..e44cd58 100644 --- a/credmonger.spec +++ b/credmonger.spec @@ -1,5 +1,5 @@ Name: credmonger -Version: 0.0 +Version: 0.1 Release: 1%{?dist} Summary: Maintains Kerberos credential caches for other processes |