commit 0dc59ae581d8c6aebd9064cf757a274d52ded598
Author: Elan Ruusamäe <[email protected]>
Date: Sat Feb 7 21:19:36 2015 +0200
separate -libs, cleanup outdated todo
mirall.spec | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/mirall.spec b/mirall.spec
index 3d9f0a1..867d5f6 100644
--- a/mirall.spec
+++ b/mirall.spec
@@ -3,15 +3,11 @@
%bcond_without qt4 # build Qt4
%bcond_without nautilus # build Nautilus extension
-# TODO:
-# * Fix ocsync packaging for and fix plugin dependencies here
-# * Fix and package lang stuff
-# * Package ruby gem based cli
%define qtver 4.7.0
Summary: Desktop file sync client for directory sharing and
syncronization
Name: mirall
Version: 1.7.0
-Release: 0.3
+Release: 0.4
License: GPL v2
Group: Libraries
Source0:
https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.bz2
@@ -20,9 +16,8 @@ URL: https://owncloud.org/install/#desktop
BuildRequires: check
BuildRequires: cmake >= 2.8
BuildRequires: doxygen
-BuildRequires: sed >= 4.0
BuildRequires: libstdc++-devel
-%{?with_nautilus:BuildRequires: nautilus-python-devel}
+BuildRequires: sed >= 4.0
%if %{with qt4}
BuildRequires: QtGui-devel >= %{qtver}
BuildRequires: QtKeychain-devel
@@ -31,6 +26,7 @@ BuildRequires: QtWebKit-devel >= %{qtver}
BuildRequires: qt4-build
BuildRequires: qt4-linguist
%endif
+Requires: %{name}-libs = %{version}-%{release}
Requires: iproute2
Requires: net-tools
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,9 +44,16 @@ Requires: nautilus-python
%description nautilus
A mirall extension to nautilus file browser.
+%package libs
+Summary: owncloudsync and ocsync libraries
+Group: Libraries
+
+%description libs
+owncloudsync and ocsync libraries.
+
%package devel
Summary: Header files for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
Header files for %{name}
@@ -85,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/{html,latex}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{html,latex}
mv $RPM_BUILD_ROOT%{_libdir}/owncloud/* $RPM_BUILD_ROOT%{_libdir}
rmdir $RPM_BUILD_ROOT%{_libdir}/owncloud
@@ -93,8 +96,8 @@ rmdir $RPM_BUILD_ROOT%{_libdir}/owncloud
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
@@ -105,26 +108,26 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/owncloudcmd.1*
%dir %{_sysconfdir}/ownCloud
%{_sysconfdir}/ownCloud/sync-exclude.lst
-%attr(755,root,root) %{_libdir}/libowncloudsync.so.*.*.*
-%ghost %{_libdir}/libowncloudsync.so.0
-%attr(755,root,root) %{_libdir}/libocsync.so.*
%{_desktopdir}/owncloud.desktop
%{_iconsdir}/hicolor/*/apps/own*.png
%dir %{_datadir}/owncloud
%dir %{_datadir}/owncloud/i18n
%{_datadir}/owncloud/i18n/*
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libocsync.so.*.*.*
+%ghost %{_libdir}/libocsync.so.0
+%attr(755,root,root) %{_libdir}/libowncloudsync.so.*.*.*
+%ghost %{_libdir}/libowncloudsync.so.0
+
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libowncloudsync.so
%attr(755,root,root) %{_libdir}/libocsync.so
%{_libdir}/libhttpbf.a
%{_includedir}/httpbf.h
-%dir %{_includedir}/owncloudsync
-%dir %{_includedir}/owncloudsync/mirall
-%dir %{_includedir}/owncloudsync/creds
-%{_includedir}/owncloudsync/mirall/*
-%{_includedir}/owncloudsync/creds/*
+%{_includedir}/owncloudsync
%if %{with nautilus}
%files nautilus
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mirall.git/commitdiff/0dc59ae581d8c6aebd9064cf757a274d52ded598
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
