[remmina] Fix dependencies and libdir
Christoph Wickert
cwickert at fedoraproject.org
Sun Apr 22 22:54:21 UTC 2012
commit 53c455b4c5f80711041b020b6c7f2e2e7373e40c
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Mon Apr 23 00:45:12 2012 +0200
Fix dependencies and libdir
remmina.spec | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/remmina.spec b/remmina.spec
index 64d6365..2b2adf3 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -70,7 +70,8 @@ The %{name}-devel package contains header files for developing plugins for
%package plugins-common
Summary: Common files for Remmina Remote Desktop Client plugins
Group: Applications/System
-Requires: remmina >= 0.9
+BuildArch: noarch
+Requires: %{name} >= 0.9
%description plugins-common
Remmina is a remote desktop client written in GTK+, aiming to be useful for
@@ -85,7 +86,7 @@ desktop client.
Summary: GNOME keyring integration for Remmina Remote Desktop Client
BuildRequires: libgnome-keyring-devel
Group: Applications/System
-Requires: %{name}-plugins-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugins-common = %{version}-%{release}
Requires: libgnome-keyring
%description plugins-gnome
@@ -100,7 +101,7 @@ remote desktop client.
%package plugins-nx
Summary: NX plugin for Remmina Remote Desktop Client
Group: Applications/System
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-plugins-common = %{version}-%{release}
Requires: nx
%description plugins-nx
@@ -115,7 +116,7 @@ This package contains the NX plugin for the Remmina remote desktop client.
Summary: RDP plugin for Remmina Remote Desktop Client
Group: Applications/System
BuildRequires: freerdp-devel
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-plugins-common = %{version}-%{release}
Requires: freerdp
%description plugins-rdp
@@ -131,7 +132,7 @@ remote desktop client.
Summary: Telepathy plugin for Remmina Remote Desktop Client
Group: Applications/System
BuildRequires: telepathy-glib-devel
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-plugins-common = %{version}-%{release}
%description plugins-telepathy
Remmina is a remote desktop client written in GTK+, aiming to be useful for
@@ -148,7 +149,7 @@ Group: Applications/System
BuildRequires: gnutls-devel
BuildRequires: libjpeg-devel
BuildRequires: libvncserver-devel
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-plugins-common = %{version}-%{release}
%description plugins-vnc
Remmina is a remote desktop client written in GTK+, aiming to be useful for
@@ -162,7 +163,7 @@ client.
%package plugins-xdmcp
Summary: XDMCP plugin for Remmina Remote Desktop Client
Group: Applications/System
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-plugins-common = %{version}-%{release}
Requires: xorg-x11-server-Xephyr
%description plugins-xdmcp
@@ -209,6 +210,7 @@ LDFLAGS="-Wl,-z,relro -Wl,--no-as-needed"
-DWITH_AVAHI=ON \
-DWITH_APPINDICATOR=OFF \
-LIBVNCSERVER_INCLUDE_DIRS=%{_includedir} \
+ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
..
make %{?_smp_mflags}
@@ -265,7 +267,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%doc
%{_includedir}/%{name}/
-%{_libdir}/pkgconfig/remmina.pc
+%{_libdir}/pkgconfig/%{name}.pc
%files plugins-common -f %{name}-plugins.lang
%defattr(-,root,root,-)
@@ -309,7 +311,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
-* Sun Apr 15 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
+* Sun Apr 22 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
- Update to 1.0.0
- Plugins are now part of this package (again)
- Fix two linker errors
More information about the scm-commits
mailing list