pldize

diff --git a/qcommandline.spec b/qcommandline.spec
index 4b09d1dafdc611d57560716f67cf5ad4d3d0e0e3..b0223defa3208727985b7b05dd141d437cc16e5e 100644 (file)
--- a/qcommandline.spec
+++ b/qcommandline.spec
@@ -4,7 +4,6 @@ Version:        0.3.0
 Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
-URL:           http://xf.iksaif.net/dev/qcommandline.html
 Source0:       http://xf.iksaif.net/dev/qcommandline/%{name}-%{version}.tar.bz2
 # Source0-md5: 89cb472a54306c7399c55285e142a84c
 # http://dev.iksaif.net/issues/253
@@ -13,21 +12,22 @@ Patch0:             %{name}-fix-pkg-config-paths.patch
 Patch101:      0001-new-ParameterFence-flag.patch
 Patch102:      0002-new-NoShortName-flag-to-allow-options-with-no-short-.patch
 Patch103:      0003-new-SuppressHelp-flag.patch
+URL:           http://xf.iksaif.net/dev/qcommandline.html
 BuildRequires: QtCore-devel
 BuildRequires: cmake
 BuildRequires: qt4-build
 BuildRequires: qt4-qmake
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 QCommandLine is a command line parser for Qt programs (like getopt).
+
 Features include options, switches, parameters and automatic
-- --version/--help generation.
+'--version' and '--help' generation.
 
 %package devel
 Summary:       Development files for %{name}
 Requires:      %{name} = %{version}-%{release}
-Requires:      cmake
-Requires:      pkgconfig
 
 %description devel
 Development files for building against %{name}.
@@ -40,7 +40,7 @@ Development files for building against %{name}.
 %patch103 -p1
 
 %build
-mkdir build
+install -d build
 cd build
 %cmake .. \
        -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules
@@ -48,10 +48,18 @@ cd build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib%{name}.so.*.*
@@ -59,14 +67,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc examples/
 %attr(755,root,root) %{_libdir}/lib%{name}.so
 %{_includedir}/%{name}
 %{_pkgconfigdir}/QCommandLine.pc
 %{_datadir}/cmake/Modules/FindQCommandLine.cmake
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%{_examplesdir}/%{name}-%{version}