diff options
| -rw-r--r-- | nx-libs.spec | 63 |
1 files changed, 24 insertions, 39 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index 1795dd4a1..8fb25bf07 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -92,8 +92,19 @@ BuildRequires: zlib-devel Obsoletes: nx < 3.5.0-19 Provides: nx = %{version}-%{release} -Obsoletes: nx%{?_isa} < 3.5.0-19 Provides: nx%{?_isa} = %{version}-%{release} +Obsoletes: libNX_Xau6 < 3.5.99.1 +Obsoletes: libNX_Xcomposite1 < 3.5.99.1 +Obsoletes: libNX_Xdamage1 < 3.5.99.1 +Obsoletes: libNX_Xdmcp6 < 3.5.99.1 +Obsoletes: libNX_Xext6 < 3.5.99.1 +Obsoletes: libNX_Xfixes3 < 3.5.99.1 +Obsoletes: libNX_Xinerama1 < 3.5.99.1 +Obsoletes: libNX_Xpm4 < 3.5.99.1 +Obsoletes: libNX_Xrandr2 < 3.5.99.1 +Obsoletes: libNX_Xrender1 < 3.5.99.1 +Obsoletes: libNX_Xtst6 < 3.5.99.1 +Obsoletes: libXcompext < 3.5.99.3 %if 0%{?el5} # For compatibility with EPEL5 @@ -114,30 +125,7 @@ Summary: Core NX protocol client library Requires: %{name}%{?_isa} >= 3.5.0.29 Obsoletes: libNX_X11 < 3.5.0.30 Provides: libNX_X11 = %{version}-%{release} -Obsoletes: libNX_X11%{?_isa} < 3.5.0.30 Provides: libNX_X11%{?_isa} = %{version}-%{release} -Conflicts: libNX_Xau6 < 3.5.99.1 -Conflicts: libNX_Xau6%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xcomposite1 < 3.5.99.1 -Conflicts: libNX_Xcomposite1%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xdamage1 < 3.5.99.1 -Conflicts: libNX_Xdamage1%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xdmcp6 < 3.5.99.1 -Conflicts: libNX_Xdmcp6%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xext6 < 3.5.99.1 -Conflicts: libNX_Xext6%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xfixes3 < 3.5.99.1 -Conflicts: libNX_Xfixes3%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xinerama1 < 3.5.99.1 -Conflicts: libNX_Xinerama1%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xpm4 < 3.5.99.1 -Conflicts: libNX_Xpm4%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xrandr2 < 3.5.99.1 -Conflicts: libNX_Xrandr2%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xrender1 < 3.5.99.1 -Conflicts: libNX_Xrender1%{?_isa} < 3.5.99.1 -Conflicts: libNX_Xtst6 < 3.5.99.1 -Conflicts: libNX_Xtst6%{?_isa} < 3.5.99.1 %if 0%{?suse_version} Requires: xorg-x11-fonts-core %endif @@ -162,8 +150,6 @@ Group: Development/Libraries Summary: Development files for the Core NX protocol library Requires: libNX_X11-6%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} -Conflicts: libNX_Xau-devel < 3.5.99.1 -Conflicts: libNX_Xau-devel%{?_isa} < 3.5.99.1 %description -n libNX_X11-devel NX is a software suite which implements very efficient compression of @@ -202,7 +188,6 @@ Summary: NX differential compression library Requires: %{name}%{?_isa} >= 3.5.0.29 Obsoletes: libXcomp <= 3.5.1 Provides: libXcomp = %{version}-%{release} -Obsoletes: libXcomp%{?_isa} <= 3.5.1 Provides: libXcomp%{?_isa} = %{version}-%{release} %description -n libXcomp3 @@ -235,7 +220,6 @@ Summary: NX session shadowing Library Requires: %{name}%{?_isa} >= 3.5.0.29 Obsoletes: libXcompshad <= 3.5.1 Provides: libXcompshad = %{version}-%{release} -Obsoletes: libXcompshad%{?_isa} <= 3.5.1 Provides: libXcompshad%{?_isa} = %{version}-%{release} %description -n libXcompshad3 @@ -252,6 +236,12 @@ Summary: Include files and libraries for NX development Requires: libNX_X11-devel%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: libNX_Xau-devel < 3.5.99.1 +Obsoletes: libNX_Xdmcp-devel < 3.5.0.32-2 +Obsoletes: libNX_Xext-devel < 3.5.99.1 +Obsoletes: libNX_Xfixes-devel < 3.5.99.1 +Obsoletes: libNX_Xpm-devel < 3.5.0.32-2 +Obsoletes: libNX_Xrender-devel < 3.5.99.1 %description devel NX is a software suite from NoMachine which implements very efficient @@ -280,12 +270,8 @@ Group: Applications/System Summary: NX Agent Obsoletes: nx < 3.5.0-19 Provides: nx = %{version}-%{release} -Obsoletes: nx%{?_isa} < 3.5.0-19 Provides: nx%{?_isa} = %{version}-%{release} -Conflicts: nxauth < 3.5.99.1 -Conflicts: nxauth%{?_isa} < 3.5.99.1 -Conflicts: libXcompext < 3.5.99.3 -Conflicts: libXcompext%{?_isa} < 3.5.99.3 +Obsoletes: nxauth < 3.5.99.1 %if 0%{?suse_version} Requires: xorg-x11-fonts-core %endif @@ -315,7 +301,6 @@ Group: Applications/System Summary: NX Proxy Obsoletes: nx < 3.5.0-19 Provides: nx = %{version}-%{release} -Obsoletes: nx%{?_isa} < 3.5.0-19 Provides: nx%{?_isa} = %{version}-%{release} %description -n nxproxy @@ -389,7 +374,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/extensions/xtestext1.h rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %if 0%{?fdupes:1} -%fdupes %buildroot/%_prefix +%fdupes %{buildroot}%{_prefix} %endif %post -p /sbin/ldconfig @@ -434,7 +419,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %files -n libXcomp-devel %defattr(-,root,root) -%_libdir/libXcomp.so +%{_libdir}/libXcomp.so %{_includedir}/nx/MD5.h %{_includedir}/nx/NX.h %{_includedir}/nx/NXalert.h @@ -448,18 +433,18 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %doc COPYING %doc doc/nxcomp/README.on-retroactive-DXPC-license %doc doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf -%_libdir/libXcomp.so.3* +%{_libdir}/libXcomp.so.3* %files -n libXcompshad-devel %defattr(-,root,root) -%_libdir/libXcompshad.so +%{_libdir}/libXcompshad.so %{_includedir}/nx/Shadow.h %{_libdir}/pkgconfig/nxcompshad.pc %files -n libXcompshad3 %defattr(-,root,root) %doc COPYING -%_libdir/libXcompshad.so.3* +%{_libdir}/libXcompshad.so.3* %files devel %defattr(-,root,root) |