rdieter pushed to signon (master). "8.57-3 (..more)"

[notifications at fedoraproject.org]

>From a6de618eb031f9ed078f24a6518992ebb3213959 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 1 Apr 2015 07:07:45 -0500
Subject: 8.57-3

- out-of-src build
- %files: track closer, less globs (sonames, pkgconfig)
- own libdir/extensions/
- patch out building of (unused) static lib

diff --git a/signon-8.57-no_static.patch b/signon-8.57-no_static.patch
new file mode 100644
index 0000000..4b490b3
--- /dev/null
+++ b/signon-8.57-no_static.patch
@@ -0,0 +1,13 @@
+diff -up signon-8.57/lib/SignOn/SignOn.pro.no_static signon-8.57/lib/SignOn/SignOn.pro
+--- signon-8.57/lib/SignOn/SignOn.pro.no_static	2014-08-25 09:33:29.000000000 -0500
++++ signon-8.57/lib/SignOn/SignOn.pro	2015-04-01 06:57:53.337391324 -0500
+@@ -1,7 +1,7 @@
+ TEMPLATE = subdirs
+ CONFIG   += ordered
+ SUBDIRS = \
+-    libsignon-qt-shared.pro \
+-    libsignon-qt-static.pro
++    libsignon-qt-shared.pro
++#   libsignon-qt-static.pro
+ 
+ include(doc/doc.pri)
diff --git a/signon.spec b/signon.spec
index 6668c6d..17ed6f3 100644
--- a/signon.spec
+++ b/signon.spec
@@ -1,6 +1,6 @@
 Name:           signon
 Version:        8.57
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Accounts framework for Linux and POSIX based platforms
 
 License:        LGPLv2
@@ -10,6 +10,10 @@ URL:            https://code.google.com/p/accounts-sso
 # as per https://groups.google.com/forum/#!topic/accounts-sso-announce/8MserPgUV5M
 Source0:        signon-%{version}.tar.bz2
 
+# cmake config files still define SIGNONQT_LIBRARIES_STATIC, but meh, anyone who
+# tries to use that deserves what they get
+Patch1: signon-8.57-no_static.patch
+
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -43,63 +47,78 @@ The %{name}-doc package contains documentation for %{name}.
 %prep
 %setup -q -n signon-%{version}
 
+%patch1 -p1 -b .no_static
+
 
 %build
 # Make sure it compiles against Fedora's Qt5
 sed -i "s/qdbusxml2cpp/qdbusxml2cpp-qt5/" src/signond/signond.pro
 
 export PATH=%{_qt5_bindir}:$PATH
-%{qmake_qt5} QMF_INSTALL_ROOT=%{_prefix} \
-    CONFIG+=release signon.pro
 
-make %{?_smp_mflags}
+mkdir %{_target_platform}
+pushd %{_target_platform}
+%{qmake_qt5} ../signon.pro \
+  CONFIG+=release \
+  QMF_INSTALL_ROOT=%{_prefix}
+popd
 
+make %{?_smp_mflags} -C %{_target_platform}
 
-%install
-make install INSTALL_ROOT=%{buildroot}
 
+%install
+make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
-# Remove static libraries
-rm %{buildroot}/%{_libdir}/*.a
+# create/own libdir/extensions
+mkdir -p %{buildroot}%{_libdir}/extensions/
 
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-
 %files
 %doc README TODO NOTES COPYING
 %config(noreplace) %{_sysconfdir}/signond.conf
 %{_bindir}/signond
 %{_bindir}/signonpluginprocess
-%{_libdir}/libsignon-extension.so.*
-%{_libdir}/libsignon-plugins-common.so.*
-%{_libdir}/libsignon-plugins.so.*
-%{_libdir}/libsignon-qt5.so.*
-%{_libdir}/signon
+%{_libdir}/libsignon-extension.so.1*
+%{_libdir}/libsignon-plugins-common.so.1*
+%{_libdir}/libsignon-plugins.so.1*
+%{_libdir}/libsignon-qt5.so.1*
+%{_libdir}/signon/
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
 
 %files devel
-%{_includedir}/signon-extension
-%{_includedir}/signon-plugins
-%{_includedir}/signon-qt5
-%{_includedir}/signond
-%{_libdir}/cmake/SignOnQt5
+%{_includedir}/signon-extension/
+%{_includedir}/signon-plugins/
+%{_includedir}/signon-qt5/
+%{_includedir}/signond/
+%{_libdir}/cmake/SignOnQt5/
 %{_libdir}/libsignon-extension.so
 %{_libdir}/libsignon-plugins-common.so
 %{_libdir}/libsignon-plugins.so
 %{_libdir}/libsignon-qt5.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/SignOnExtension.pc
+%{_libdir}/pkgconfig/libsignon-qt5.pc
+%{_libdir}/pkgconfig/signon-plugins-common.pc
+%{_libdir}/pkgconfig/signon-plugins.pc
+%{_libdir}/pkgconfig/signond.pc
 
 %files doc
-%{_docdir}/signon
-%{_docdir}/libsignon-qt
-%{_docdir}/signon-plugins
-%{_docdir}/signon-plugins-dev
+%{_docdir}/signon/
+%{_docdir}/libsignon-qt/
+%{_docdir}/signon-plugins/
+%{_docdir}/signon-plugins-dev/
 
 
 %changelog
+* Wed Apr 01 2015 Rex Dieter <rdieter at fedoraproject.org> - 8.57-3
+- out-of-src build
+- %%files: track closer, less globs (sonames, pkgconfig)
+- own libdir/extensions/
+- patch out building of (unused) static lib
+
 * Sat Mar 28 2015 Daniel Vrátil <dvratil at redhat.com> - 8.57-2
 - rename to signon
 - drop glib2-devel dep
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/signon.git/commit/?h=master&id=a6de618eb031f9ed078f24a6518992ebb3213959