[packages/owncloudclient] cleanups; add -libs and -devel

glen glen at pld-linux.org
Tue Apr 12 15:17:44 CEST 2016


commit 4269689744f16ea33cbbcadb50b069a955d2eacd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 12 16:16:47 2016 +0300

    cleanups; add -libs and -devel

 owncloudclient.spec | 90 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 35 deletions(-)
---
diff --git a/owncloudclient.spec b/owncloudclient.spec
index d131db6..deb6036 100644
--- a/owncloudclient.spec
+++ b/owncloudclient.spec
@@ -2,25 +2,22 @@ Summary:	The ownCloud client
 Name:		owncloudclient
 Version:	2.1.1
 Release:	0.9
-License:	GPL-2.0+
+License:	GPL v2+
 Group:		X11/Applications
-URL:		https://www.owncloud.com
 Source0:	https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
 # Source0-md5:	63a971158201a8dffe96a02c54b86819
-#Source1:	owncloud.sh
-#Source2:	owncloudcmd.sh
+URL:		https://www.owncloud.com/
 BuildRequires:	QtKeychain-devel
 BuildRequires:	cmake >= 2.8.11
 BuildRequires:	desktop-file-utils
 BuildRequires:	openssl-devel
 BuildRequires:	python-Sphinx
-#BuildRequires:	qt4-devel >= 4.7
-#BuildRequires:	qtwebkit-devel >= 2.2
 BuildRequires:	sphinx-pdg
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texlive-latex-ams
+BuildRequires:	xz
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	Qt5Gui-platform-xcb
-# Obsoletes mirall and all it's subpackages
-#Requires:	mirall-libs
 Suggests:	%{name}-nautilus
 Suggests:	%{name}-nemo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,6 +40,25 @@ controlled architecture. You can easily extend ownCloud with plug-ins
 from the community, or that you build yourself to meet the
 requirements of your infrastructure and business.
 
+%package libs
+Summary:	Shared ownCloud client libraries
+Group:		Libraries
+
+%description libs
+Shared ownCloud client libraries.
+
+%package devel
+Summary:	Header files for %{name} library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki %{name}
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description devel
+Header files for %{name} library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki %{name}.
+
 %prep
 %setup -q
 
@@ -50,19 +66,15 @@ requirements of your infrastructure and business.
 install -d build
 cd build
 %cmake \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
 	-DQTKEYCHAIN_INCLUDE_DIR=/usr/include/qtkeychain \
 	-DQTKEYCHAIN_LIBRARY=/usr/%{_lib}/libqtkeychain.so \
-	../
+	..
 %{__make}
 
 # documentation here?
-if [ -e conf.py ];
-then
-  # for old cmake versions we need to move the conf.py.
-  mv conf.py doc/
+if [ -e conf.py ]; then
+	# for old cmake versions we need to move the conf.py.
+	mv conf.py doc/
 fi
 
 %{__make} doc
@@ -72,43 +84,51 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv ${RPM_BUILD_ROOT}%{_docdir}/html ${RPM_BUILD_ROOT}%{_docdir}/%{name}
-mv ${RPM_BUILD_ROOT}%{_docdir}/latex ${RPM_BUILD_ROOT}%{_docdir}/%{name}
-rm ${RPM_BUILD_ROOT}%{_docdir}/%{name}/unthemed/.buildinfo
+mv $RPM_BUILD_ROOT%{_docdir}/html ${RPM_BUILD_ROOT}%{_docdir}/%{name}
+mv $RPM_BUILD_ROOT%{_docdir}/latex ${RPM_BUILD_ROOT}%{_docdir}/%{name}
+rm $RPM_BUILD_ROOT%{_docdir}/%{name}/unthemed/.buildinfo
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-/bin/%update_icon_cache_post hicolor &>/dev/null || :
-/sbin/ldconfig
+%update_icon_cache_post hicolor
 
 %postun
 if [ $1 -eq 0 ] ; then
-    /bin/%update_icon_cache_post hicolor &>/dev/null
-    %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+	%update_icon_cache_post hicolor
 fi
-/sbin/ldconfig
+
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc README.md COPYING
 %doc %{_docdir}/%{name}
-%config %{_sysconfdir}/ownCloud
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ownCloud/*
 %attr(755,root,root) %{_bindir}/owncloud
 %attr(755,root,root) %{_bindir}/owncloudcmd
 %{_desktopdir}/owncloud.desktop
 %{_iconsdir}/*/*/apps/*.png
 %{_datadir}/owncloud
-# conflicts mirall-libs:
-#%{_libdir}/libowncloudsync.so.*
-%{_libdir}/owncloud/libocsync.so.*
+#%{_libdir}/owncloud/libocsync.so.*
 %dir %{_libdir}/owncloud
+%{_mandir}/man1/owncloud*
+
+# subpackages
 %{_datadir}/nautilus-python/extensions/syncstate.py*
 %{_datadir}/nemo-python/extensions/syncstate.py*
-%{_mandir}/man1/owncloud*
 
-### Make separate devel package
-#%{_libdir}/libowncloudsync.so
-#%{_libdir}/owncloud/libocsync.so
-#%{_includedir}/owncloudsync/
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libowncloudsync.so.*.*.*
+%ghost %{_libdir}/libowncloudsync.so.0
+%attr(755,root,root) %{_libdir}/owncloud/libocsync.so.*.*.*
+%ghost %{_libdir}/owncloud/libocsync.so.0
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/owncloudsync
+%{_libdir}/libowncloudsync.so
+%{_libdir}/owncloud/libocsync.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloudclient.git/commitdiff/4269689744f16ea33cbbcadb50b069a955d2eacd



More information about the pld-cvs-commit mailing list