[libdaemon] - Merge-review cleanup (#225995)
paragn
paragn at fedoraproject.org
Wed Sep 29 04:09:22 UTC 2010
commit efe16797099b1a5669d4a14b4344732475659d14
Author: paragn <paragn at fedoraproject.org>
Date: Wed Sep 29 09:43:19 2010 +0530
- Merge-review cleanup (#225995)
libdaemon.spec | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/libdaemon.spec b/libdaemon.spec
index ea772ff..1883dfa 100644
--- a/libdaemon.spec
+++ b/libdaemon.spec
@@ -6,7 +6,6 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://0pointer.de/lennart/projects/libdaemon/
Source0: http://0pointer.de/lennart/projects/libdaemon/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Requires lynx to build the docs
BuildRequires: lynx
@@ -28,7 +27,6 @@ It consists of the following parts:
Group: Development/Libraries
Summary: Libraries and header files for libdaemon development
Requires: libdaemon = %{version}-%{release}
-Requires: pkgconfig
%description devel
The libdaemon-devel package contains the header files and libraries
@@ -42,34 +40,33 @@ necessary for developing programs using libdaemon.
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
+
rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/README
rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/README.html
rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/style.css
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc LICENSE README
%{_libdir}/*so.*
%files devel
-%defattr(-,root,root)
-%doc LICENSE README
+%defattr(-,root,root,-)
%doc doc/README.html doc/style.css
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Sep 10 2010 Parag Nemade <paragn AT fedoraproject.org> 0.14-2
+- Merge-review cleanup (#225995)
+
* Sun Oct 18 2009 Lennart Poettering <lpoetter at redhat.com> - 0.14-1
- New release 0.14
More information about the scm-commits
mailing list