aboutsummaryrefslogtreecommitdiff
path: root/dino.spec
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2017-04-03 14:10:17 +0200
committerMarvin W <git@larma.de>2017-04-03 15:05:39 +0200
commit8248cfcbb25dc14c81bd9673c8b3642ce98ea495 (patch)
tree21ec03ad902b001c3e84c428a31e10f62ad18614 /dino.spec
parent22adbd38dca0868f0e10754314a3859bba0a7d87 (diff)
downloaddino-8248cfcbb25dc14c81bd9673c8b3642ce98ea495.tar.gz
dino-8248cfcbb25dc14c81bd9673c8b3642ce98ea495.zip
Make FHS compliant, split RPMs, fix compilation on older GCCs
Diffstat (limited to 'dino.spec')
-rw-r--r--dino.spec89
1 files changed, 73 insertions, 16 deletions
diff --git a/dino.spec b/dino.spec
index 01284a21..f0865824 100644
--- a/dino.spec
+++ b/dino.spec
@@ -22,9 +22,9 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: dino
-Version: 0
-Release: 0%{?dist}
-#Release: 0.git.%{shortcommit}%{?dist}
+Version: 0.0
+Release: 1%{?dist}
+#Release: 1.git.%{shortcommit}%{?dist}
Summary: Modern Jabber/XMPP Client using GTK+/Vala
License: GPLv3
URL: https://github.com/dino/dino
@@ -45,7 +45,11 @@ BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(openssl)
BuildRequires: gpgme-devel
-Requires: hicolor-icon-theme
+Requires: hicolor-icon-theme
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+# Technically these aren't requirements, we just want them always installed...
+Requires: %{name}-plugin-omemo%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugin-openpgp%{?_isa} = %{version}-%{release}
%description
Dino is an instant messaging client for the Jabber/XMPP network,
@@ -56,14 +60,36 @@ for XMPP's latest encryption features. Future versions will provide
a plug-in API, so that developers can easily add new optional
features.
-%package devel
+%package libs
+Summary: Libraries for %{name}
+
+%package libs-devel
Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%package plugin-omemo
+Summary: OMEMO plugin for %{name}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%package plugin-openpgp
+Summary: OMEMO plugin for %{name}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%description devel
-The %{name}-devel package contains libraries and header files for
+%description libs
+The %{name}-libs package contains libraries used and provided by %{name}.
+
+%description libs-devel
+The %{name}-libs-devel package contains libraries and header files for
developing plugins for %{name}.
+%description plugin-omemo
+The %{name}-plugin-omemo package contains a plugin that adds support for
+OMEMO encryption to Dino.
+
+%description plugin-openpgp
+The %{name}-plugin-openpgp package contains a plugin that adds support for
+OpenPGP encryption to Dino.
+
%prep
%setup -n "dino-v%{version}"
#%setup -n "dino-%{commit}"
@@ -85,31 +111,62 @@ update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
- glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
%posttrans
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post libs
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+
+%postun libs
+/sbin/ldconfig
+
+%posttrans libs
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files
%license LICENSE
%doc README.md
%{_bindir}/dino
-%{_libdir}/libdino.so
-%{_libdir}/libqlite.so
-%{_libdir}/libxmpp-vala.so
-%{_datadir}/dino
%{_datadir}/applications/dino.desktop
-%{_datadir}/glib-2.0/schemas/dino.gschema.xml
%{_datadir}/icons/hicolor/*/apps/dino.*
%{_datadir}/icons/hicolor/*/apps/dino-*
%{_datadir}/icons/hicolor/*/status/dino-*
-%files devel
+%files libs
+%license LICENSE
+%doc README.md
+%{_datadir}/glib-2.0/schemas/dino.gschema.xml
+%{_libdir}/libdino.so.*
+%{_libdir}/libqlite.so.*
+%{_libdir}/libxmpp-vala.so.*
+
+%files libs-devel
+%license LICENSE
+%doc README.md
%{_includedir}/*
+%{_libdir}/libdino.so
+%{_libdir}/libqlite.so
+%{_libdir}/libxmpp-vala.so
%{_datadir}/vala/vapi
+%files plugin-omemo
+%license LICENSE
+%doc README.md
+%{_libdir}/dino/plugins/omemo.so
+
+%files plugin-openpgp
+%license LICENSE
+%doc README.md
+%{_libdir}/dino/plugins/openpgp.so
+
%changelog
-* Fri Mar 24 2017 - 0.0
+* Mon Apr 3 2017 - 0.0-1
+- Split packages
+
+* Fri Mar 24 2017 - 0.0-0
- Initial version