diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-10-13 10:29:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-10-13 10:29:51 +0200 |
| commit | b96e120f10ca2e0569fc255a58ae3c90f39d7d2c (patch) | |
| tree | bc72d4b6895d9f7dc0b8bed08b58a125c78cb44b | |
| parent | 5e4ae04ef5363f647fa8049be80e38a5e932dd9e (diff) | |
| download | nx-libs-b96e120f10ca2e0569fc255a58ae3c90f39d7d2c.tar.gz nx-libs-b96e120f10ca2e0569fc255a58ae3c90f39d7d2c.tar.bz2 nx-libs-b96e120f10ca2e0569fc255a58ae3c90f39d7d2c.zip | |
nx-libs.spec: follow-up commit for last commit
| -rw-r--r-- | nx-libs.spec | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index deff5334d..0e19f6a1e 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -18,6 +18,32 @@ Source0: %{name}-%{version}.tar.gz # Remove bundled libraries #Patch0: nx-libs-bundled.patch +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif +%if 0%{?suse_version} +BuildRequires: fdupes +%if 0%{?suse_version} >= 1130 +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(fontenc) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(x11) +%else +BuildRequires: libexpat-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: libpng-devel +BuildRequires: libxml2-devel +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libfontenc-devel +%endif +BuildRequires: xorg-x11-util-devel +%endif + +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: autoconf BuildRequires: expat-devel BuildRequires: fontconfig-devel @@ -26,10 +52,18 @@ BuildRequires: libfontenc-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libxml2-devel +%endif + # For imake BuildRequires: xorg-x11-proto-devel BuildRequires: zlib-devel +%if 0%{?suse_version} >= 1130 || 0%{?fedora_version} +%define cond_noarch BuildArch: noarch +%else +%define cond_noarch %nil +%endif + Obsoletes: nx < 3.5.0-19 Provides: nx = %{version}-%{release} Obsoletes: nx%{?_isa} < 3.5.0-19 @@ -53,6 +87,10 @@ nxagent/x2goagent. Group: System Environment/Libraries Summary: Core NX protocol client library Requires: %{name}%{?_isa} = %{version}-%{release} +%if 0%{?suse_version} +Requires: xorg-x11-fonts-core +%endif +Conflicts: nx %description -n libNX_X11 The X Window System is a network-transparent window system that was @@ -430,6 +468,9 @@ Obsoletes: nx < 3.5.0-19 Provides: nx = %{version}-%{release} Obsoletes: nx%{?_isa} < 3.5.0-19 Provides: nx%{?_isa} = %{version}-%{release} +%if 0%{?suse_version} +Requires: xorg-x11-fonts-core +%endif %description -n nxagent NX is a software suite which implements very efficient compression of @@ -577,6 +618,10 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans ln -s -f ../../../../%{_lib}/libX11.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6 +%if 0%{?fdupes:1} +%fdupes %buildroot/%_prefix +%endif + %post -p /sbin/ldconfig %post -n libNX_X11 -p /sbin/ldconfig %post -n libNX_Xau -p /sbin/ldconfig |