From 6ba2defeecd322c80f03b616023927f6b196741f Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Wed, 19 Oct 2011 12:11:43 +0200
Subject: [PATCH] pre 1.0.4 nightly snapshot

---
 .gitignore   |  1 +
 lockdev.spec | 69 ++++++++++++++++++++++++----------------------------
 sources      |  2 +-
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3ebb457..ed0aee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 lockdev_1.0.3.orig.tar.gz
+/lockdev-1.0.4.20111007git.tar.gz
diff --git a/lockdev.spec b/lockdev.spec
index 39ee1e4..2b2faa1 100644
--- a/lockdev.spec
+++ b/lockdev.spec
@@ -1,32 +1,31 @@
 # Where lock files are stored
 %global _lockdir %{_localstatedir}/lock/lockdev
 
+%global checkout 20111007git
+%global co_date  2011-10-07
+
 Summary: A library for locking devices
 Name: lockdev
-Version: 1.0.3
-Release: 10%{?dist}
+Version: 1.0.4
+Release: 0.1.%{checkout}%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
-Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
-Source1: lockdev.8
 
-Patch0: lockdev-1.0.3-rh.patch
-Patch1: lockdev-1.0.3-shared.patch
-Patch2: lockdev-1.0.3-cli.patch
-Patch3: lockdev-1.0.3-checkname.patch
-Patch4: lockdev-1.0.3-pidexists.patch
-Patch5: lockdev-1.0.3-gccwarn.patch
-Patch6: lockdev-1.0.3-man8.patch
+# This is a nightly snapshot downloaded via
+# https://alioth.debian.org/snapshots.php?group_id=100443
+Source0: lockdev-%{version}.%{checkout}.tar.gz
 
 Requires(pre): shadow-utils
 Requires(post): glibc
 Requires(postun): glibc
 Requires: systemd-units >= 13
 
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: perl
 BuildRequires: perl(ExtUtils::MakeMaker)
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Lockdev provides a reliable way to put an exclusive lock to devices
@@ -44,31 +43,27 @@ package contains the development headers.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .redhat
-%patch1 -p1 -b .shared
-%patch2 -p1 -b .cli
-%patch3 -p1 -b .checkname
-%patch4 -p1 -b .pidexists
-%patch5 -p1 -b .warn
-%patch6 -p1 -b .man8
-
-cp %SOURCE1 ./docs
+%setup -q -n lockdev-scm-%{co_date}
 
 %build
-make "CFLAGS=${RPM_OPT_FLAGS} -fPIC -D_PATH_LOCK=\\\"%{_lockdir}\\\""
+# Generate version information from git release tag
+./scripts/git-version > VERSION
+
+# To satisfy automake
+touch ChangeLog
+
+# Bootstrap autotools
+autoreconf --verbose --force --install
+
+CFLAGS="${RPM_OPT_FLAGS} -D_PATH_LOCK=\\\"%{_lockdir}\\\"" \
+%configure --disable-static --enable-helper
+
+make %{?_smp_mflags}
 
 %install
-rm -fr $RPM_BUILD_ROOT
-make \
-    sbindir=${RPM_BUILD_ROOT}%{_sbindir} \
-    libdir=${RPM_BUILD_ROOT}%{_libdir} \
-    incdir=${RPM_BUILD_ROOT}%{_includedir} \
-    mandir=${RPM_BUILD_ROOT}%{_mandir} \
-        install
-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
+make install DESTDIR=%{buildroot}
 
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/liblockdev.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 mkdir -p $RPM_BUILD_ROOT%{_lockdir}
 
@@ -79,24 +74,24 @@ exit 0
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-rm -fr $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc LICENSE AUTHORS ChangeLog ChangeLog.old
+%doc COPYING AUTHORS
 %dir %attr(0775,root,lock) %{_lockdir}
 %attr(2711,root,lock)  %{_sbindir}/lockdev
 %{_libdir}/*.so.*
 %{_mandir}/man8/*
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/lockdev.pc
 %{_mandir}/man3/*
 %{_includedir}/*
 
 %changelog
+* Fri Oct 07 2011 Jiri Popelka <jpopelka@redhat.com> - 1.0.4-0.1.20111007git
+- pre 1.0.4 nightly snapshot
+
 * Mon Apr 04 2011 Jiri Popelka <jpopelka@redhat.com> - 1.0.3-10
 - Revert previous change (#681898)
 - /etc/tmpfiles.d/lockdev.conf moved into systemd upstream (#692714)
diff --git a/sources b/sources
index 362ba27..4ccf878 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64b9c1b87b125fc348e892e24625524a  lockdev_1.0.3.orig.tar.gz
+c0015d1bcd155b51df688467ed34137f  lockdev-1.0.4.20111007git.tar.gz