[kup/f16] Upstream 0.3.1

[Konstantin Ryabitsev]

commit 6731aedb12109198e1ce999ff78130d7fbec0ac6
Author: Konstantin Ryabitsev <mricon at kernel.org>
Date:   Thu Nov 24 11:34:49 2011 -0500

    Upstream 0.3.1

 .gitignore              |    1 +
 kup-generate-tarball.sh |   31 -------------------------------
 kup.spec                |   23 +++++++++++++++--------
 sources                 |    2 +-
 4 files changed, 17 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 129bd96..2fcaf50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kup-0.3.tar.gz
+/kup-0.3.1.tar.bz2
diff --git a/kup.spec b/kup.spec
index 7dfed15..d0bbbed 100644
--- a/kup.spec
+++ b/kup.spec
@@ -1,14 +1,13 @@
 Name:       kup
-Version:    0.3
-Release:    2%{?dist}
+Version:    0.3.1
+Release:    1%{?dist}
 Summary:    Kernel.org Uploader
 
 Group:      Development/Tools
 License:    GPLv2
 URL:        https://git.kernel.org/?p=utils/kup/kup.git;a=summary
-Source0:    kup-%{version}.tar.gz
-Source1:    kup-generate-tarball.sh
-Source2:    kup-server-tmpfiles.conf
+Source0:    https://www.kernel.org/pub/software/network/kup/kup-%{version}.tar.bz2
+Source1:    kup-server-tmpfiles.conf
 BuildArch:  noarch
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -52,17 +51,19 @@ This package includes additional tools to help in kup-server administration.
 %install
 rm -rf %{buildroot}
 mkdir -pm 0755 \
-    %{buildroot}%{_bindir}      \
-    %{buildroot}%{_mandir}/man1
+    %{buildroot}%{_bindir}        \
+    %{buildroot}%{_mandir}/man1   \
+    %{buildroot}%{_sysconfdir}/kup
 
 install -pm 0755 kup gpg-sign-all genrings kup-server %{buildroot}%{_bindir}
 install -pm 0644 kup.1 %{buildroot}%{_mandir}/man1/
+install -pm 0644 kup-server.cfg %{buildroot}/%{_sysconfdir}/kup/kup-server.cfg
 
 # Runtime directories and files
 mkdir -pm 0755 \
     %{buildroot}%{_sharedstatedir}/kup/{pub,tmp,pgp} \
     %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -pm 0644 %{SOURCE2} \
+install -pm 0644 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/tmpfiles.d/kup-server.conf
 
 mkdir -p %{buildroot}%{_localstatedir}/run/kup
@@ -83,6 +84,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README test
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/kup-server.conf
+%config %dir %{_sysconfdir}/kup
+%config(noreplace) %{_sysconfdir}/kup/kup-server.cfg
 %{_bindir}/kup-server
 %dir %attr(1777,root,root) %{_sharedstatedir}/kup/tmp
 %dir %{_sharedstatedir}/kup
@@ -98,6 +101,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Nov 24 2011 Konstantin Ryabitsev <mricon at kernel.org> - 0.3.1-1
+- Upstream 0.3.1
+- Upstream now releases tarballs, so remove the gen-tarball script.
+
 * Fri Nov 18 2011 Konstantin Ryabitsev <mricon at kernel.org> - 0.3-2
 - Require gnupg and xz for kup-server (gzip and bzip2 are in base)
 
diff --git a/sources b/sources
index 00db287..909ecef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c59e270a99696905f09b91265ecfdb0  kup-0.3.tar.gz
+8bc208d2777bdaa0e22eb0fa6392a8fd  kup-0.3.1.tar.bz2