From ba8198eab845197bac4ca7aaccf42e7c9f0c2ddc Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Aug 28 2012 21:03:21 +0000
Subject: leave release numbers out of tags and tarball name


---

diff --git a/Makefile.am b/Makefile.am
index b278048..d38f4e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,12 @@ SUBDIRS = src tests po
 
 SVERSION=$(shell awk '/^Version:/ {print $$NF}' $(top_srcdir)/pam_krb5.spec | sed 's,%.*,,' | head -n 1)
 SRELEASE=$(shell awk '/^Release:/ {print $$NF}' $(top_srcdir)/pam_krb5.spec | sed 's,%.*,,' | head -n 1)
-GITTAG=$(PACKAGE)-$(VERSION)-$(SRELEASE)
+GITTAG=$(PACKAGE)-$(VERSION)
 distdir=$(GITTAG)
 DISTCLEANFILES = tests/kdc/krb5cc_* tests/kdc/tkt*
 
 tag:
-	test $(GITTAG) = $(PACKAGE)-$(SVERSION)-$(SRELEASE)
+	test $(GITTAG) = $(PACKAGE)-$(SVERSION)
 	tx pull
 	git tag $(GITTAG)
 
diff --git a/pam_krb5.spec b/pam_krb5.spec
index f25c02b..3f3d059 100644
--- a/pam_krb5.spec
+++ b/pam_krb5.spec
@@ -2,8 +2,8 @@ Summary: A Pluggable Authentication Module for Kerberos 5
 Name: pam_krb5
 Version: 2.3.90
 Release: 0%{?dist}
-Source0: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}-1.tar.gz
-Source1: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}-1.tar.gz.sig
+Source0: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}.tar.gz
+Source1: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}.tar.gz.sig
 License: BSD or LGPLv2+
 Group: System Environment/Base
 URL: https://fedorahosted.org/pam_krb5/
@@ -18,7 +18,7 @@ creation, and optional TGT verification and conversion to Kerberos IV tickets.
 The included pam_krb5afs module also gets AFS tokens if so configured.
 
 %prep
-%setup -q -n pam_krb5-%{version}-1
+%setup -q
 
 %build
 configure_flags=