Djam/libxfixes
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libxfixes.git synced 2025-02-24 09:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync with Cooker (cleanups) and fix unversioned Obsoletes

Browse source
This commit is contained in:
Andrey Bondrov 2012-08-03 21:54:52 +11:00
parent 29dc654b0d
commit 325d6c02ff
1 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libxfixes.spec
View file

@ -5,13 +5,13 @@
Name: libxfixes Name: libxfixes
Summary: X Fixes Library Summary: X Fixes Library
Version: 5.0 Version: 5.0
Release: 2 Release: 4
Group: Development/X11 Group: Development/X11
License: MIT License: MIT
URL: http://xorg.freedesktop.org URL: http://xorg.freedesktop.org
Source0: http://xorg.freedesktop.org/releases/individual/lib/libXfixes-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/individual/lib/libXfixes-%{version}.tar.bz2
BuildRequires: libx11-devel >= 1.0.0 BuildRequires: pkgconfig(x11)
BuildRequires: x11-proto-devel >= 7.6-3 BuildRequires: x11-proto-devel >= 7.6-3
BuildRequires: x11-util-macros >= 1.0.1 BuildRequires: x11-util-macros >= 1.0.1
@ -30,10 +30,10 @@ Provides: %{name} = %{version}
%package -n %{develname} %package -n %{develname}
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/X11 Group: Development/X11
Requires: %{libname} = %{EVRD} Requires: %{libname} = %{version}-%{release}
Provides: libxfixes-devel = %{EVRD} Provides: libxfixes-devel = %{version}-%{release}
Obsoletes: %{_lib}xfixes3-devel Obsoletes: %{_lib}xfixes3-devel < 5.0
Obsoletes: %{_lib}xfixes-static-devel Obsoletes: %{_lib}xfixes-static-devel < 5.0
Conflicts: libxorg-x11-devel < 7.0 Conflicts: libxorg-x11-devel < 7.0
%description -n %{develname} %description -n %{develname}
@ -54,11 +54,6 @@ Development files for %{name}
rm -rf %{buildroot} rm -rf %{buildroot}
%makeinstall_std %makeinstall_std
%pre -n %{develname}
if [ -h %{_includedir}/X11 ]; then
rm -f %{_includedir}/X11
fi
%files -n %{libname} %files -n %{libname}
%{_libdir}/libXfixes.so.%{major}* %{_libdir}/libXfixes.so.%{major}*
@ -68,9 +63,11 @@ fi
%{_includedir}/X11/extensions/Xfixes.h %{_includedir}/X11/extensions/Xfixes.h
%{_mandir}/man3/Xfixes.* %{_mandir}/man3/Xfixes.*
%changelog %changelog
* Thu Mar 08 2012 Paulo Andrade <pcpa@mandriva.com.br> 5.0-3
+ Revision: 783360
- Remove pre scriptlet to correct rpm upgrade moving from /usr/X11R6.
* Tue Dec 27 2011 Matthew Dawkins <mattydaw@mandriva.org> 5.0-2 * Tue Dec 27 2011 Matthew Dawkins <mattydaw@mandriva.org> 5.0-2
+ Revision: 745649 + Revision: 745649
- rebuild - rebuild