From 3a3d4d5083170c986f9d6685c50a8cdf9b2aa6ab Mon Sep 17 00:00:00 2001
From: paragn <paragn@fedoraproject.org>
Date: Fri, 22 Oct 2010 09:38:32 +0530
Subject: [PATCH] - Merge-review cleanup (#226100)

---
 lksctp-tools.spec | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/lksctp-tools.spec b/lksctp-tools.spec
index 5b3cca2..0b4713b 100644
--- a/lksctp-tools.spec
+++ b/lksctp-tools.spec
@@ -1,18 +1,14 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
 Version: 1.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 # src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification
 License: GPLv2 and GPLv2+ and LGPLv2 and MIT
 Group: System Environment/Libraries
 URL: http://lksctp.sourceforge.net
-Source0: %{name}-%{version}.tar.gz
+Source0:  http://downloads.sourceforge.net/lksctp/%{name}-%{version}.tar.gz
 Patch0: lksctp-tools-1.0.6-libdir.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, automake, autoconf
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Conflicts: kernel < 2.6.10
 
 %description
 This is the lksctp-tools package for Linux Kernel SCTP (Stream Control
@@ -58,21 +54,17 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 rm -f doc/rfc2960.txt doc/states.txt
-make install DESTDIR="$RPM_BUILD_ROOT"
+make install DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p"
 
 find $RPM_BUILD_ROOT/%{_libdir}/ -name "*.la"  | xargs rm -f
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING* README
 %{_bindir}/*
 %{_libdir}/libsctp.so.*
@@ -81,19 +73,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/*
 
 %files devel
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libsctp.so
-%dir %{_libdir}/lksctp-tools/
 %{_libdir}/lksctp-tools/libwithsctp.so
 %{_datadir}/lksctp-tools/
 %{_mandir}/man3/*
 
 %files doc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc doc/*.txt
 
 %changelog
+* Tue Oct 05 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.0.11-2
+- Merge-review cleanup (#226100)
+
 * Tue Dec  1 2009 Jan Safranek <jsafrane@redhat.com> 1.0.11-1
 - Update to 1.0.11
 - Remove rpath from compiled binaries