automatic version update by autodist [release 1.15.1-1mamba;Mon Apr 14 2014]
This commit is contained in:
parent
a7fefdbd61
commit
c7886bd722
152
xorg-server.spec
152
xorg-server.spec
@ -1,6 +1,6 @@
|
||||
Name: xorg-server
|
||||
Version: 1.12.4
|
||||
Release: 5mamba
|
||||
Version: 1.15.1
|
||||
Release: 1mamba
|
||||
Summary: The core of the X.Org Foundation implementation of the X Window system
|
||||
Group: System/X11
|
||||
Vendor: openmamba
|
||||
@ -10,10 +10,11 @@ URL: http://www.x.org
|
||||
Source: ftp://x.org/pub/individual/xserver/xorg-server-%{version}.tar.bz2
|
||||
Source10: XFree86-skel-.xinitrc
|
||||
Source11: xorg-server-xprofile
|
||||
Patch0: %{name}-1.12.1-Xorg_configure.patch
|
||||
Patch1: %{name}-1.3.0.0-hsync_higher_default.patch
|
||||
Patch0: xorg-server-1.12.1-Xorg_configure.patch
|
||||
Patch1: xorg-server-1.3.0.0-hsync_higher_default.patch
|
||||
Patch2: %{name}-1.6.4-fix_DGA_removal.patch
|
||||
License: MIT
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libdmx-devel
|
||||
@ -52,6 +53,8 @@ BuildRequires: libpciaccess-devel
|
||||
%ifarch %{ix86} x86_64
|
||||
BuildRequires: libsmbios-devel
|
||||
%endif
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: presentproto-devel
|
||||
Requires: xorgdrvinput
|
||||
Requires: xorgdrvvideo
|
||||
Requires: xorg-fonts-base
|
||||
@ -61,7 +64,6 @@ Requires: xorglibGL
|
||||
Requires: xorglibglx
|
||||
Obsoletes: Xorg
|
||||
Provides: Xorg
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
%description
|
||||
The X Window System provides the base technology for developing graphical user interfaces.
|
||||
@ -101,10 +103,6 @@ X.Org glx extension.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
ld -v | grep gold && {
|
||||
echo "ERROR: building with gold produces failing binaries; aborting."
|
||||
exit 1
|
||||
}
|
||||
#%patch0 -p1
|
||||
#%patch1 -p1
|
||||
#%patch2 -p1
|
||||
@ -145,8 +143,8 @@ install hw/xfree86/parser/xf86Optrec.h %{buildroot}%{_includedir}/xorg/
|
||||
mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
|
||||
%{buildroot}%{_libdir}/xorg/modules/extensions/libglx_dri_so
|
||||
|
||||
mv %{buildroot}%{_libdir}/xorg/modules/extensions/libdri.so \
|
||||
%{buildroot}%{_libdir}/xorg/modules/extensions/libdri_so
|
||||
#mv %{buildroot}%{_libdir}/xorg/modules/extensions/libdri.so \
|
||||
# %{buildroot}%{_libdir}/xorg/modules/extensions/libdri_so
|
||||
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
cat > %{buildroot}%{_sbindir}/update-alternatives-set-dri << _EOF
|
||||
@ -154,8 +152,8 @@ cat > %{buildroot}%{_sbindir}/update-alternatives-set-dri << _EOF
|
||||
update-alternatives \
|
||||
--set libglx.so %{_libdir}/xorg/modules/extensions/libglx_dri_so
|
||||
|
||||
update-alternatives \
|
||||
--set libdri.so %{_libdir}/xorg/modules/extensions/libdri_so
|
||||
#update-alternatives \
|
||||
# --set libdri.so %{_libdir}/xorg/modules/extensions/libdri_so
|
||||
|
||||
update-alternatives \
|
||||
--set libGL.so.1 %{_libdir}/libGL_so.1.2
|
||||
@ -193,9 +191,9 @@ exit 0
|
||||
--install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so \
|
||||
%{_libdir}/xorg/modules/extensions/libglx_dri_so 50
|
||||
|
||||
/usr/sbin/update-alternatives \
|
||||
--install %{_libdir}/xorg/modules/extensions/libdri.so libdri.so \
|
||||
%{_libdir}/xorg/modules/extensions/libdri_so 50
|
||||
#/usr/sbin/update-alternatives \
|
||||
# --install %{_libdir}/xorg/modules/extensions/libdri.so libdri.so \
|
||||
# %{_libdir}/xorg/modules/extensions/libdri_so 50
|
||||
|
||||
[ -e `readlink /etc/alternatives/libglx.so` ] || {
|
||||
update-alternatives-set-dri
|
||||
@ -222,66 +220,34 @@ exit 0
|
||||
%{_sysconfdir}/xprofile
|
||||
%{_bindir}/X
|
||||
%{_bindir}/Xnest
|
||||
%attr(4755, root, root) %{_bindir}/Xorg
|
||||
%{_bindir}/Xorg
|
||||
#%{_bindir}/Xprt
|
||||
%{_bindir}/Xvfb
|
||||
%{_bindir}/cvt
|
||||
%{_bindir}/gtf
|
||||
#%{_bindir}/inb
|
||||
#%{_bindir}/inl
|
||||
#%{_bindir}/inw
|
||||
#%{_bindir}/ioport
|
||||
#%{_bindir}/outb
|
||||
#%{_bindir}/outl
|
||||
#%{_bindir}/outw
|
||||
#%{_bindir}/pcitweak
|
||||
#%{_bindir}/scanpci
|
||||
#%{_bindir}/xorgcfg
|
||||
#%{_bindir}/xorgconfig
|
||||
%attr(0755,root,root) %{_sbindir}/update-alternatives-set-dri
|
||||
#%{_libdir}/X11/Cards
|
||||
#%{_libdir}/X11/Options
|
||||
#%{_libdir}/X11/xserver/*
|
||||
%{_libdir}/xorg/modules/extensions/libdbe.la
|
||||
%{_libdir}/xorg/modules/extensions/libdbe.so
|
||||
%{_libdir}/xorg/modules/extensions/libdri.la
|
||||
%{_libdir}/xorg/modules/extensions/libdri_so
|
||||
%{_libdir}/xorg/modules/extensions/libdri2.la
|
||||
%{_libdir}/xorg/modules/extensions/libdri2.so
|
||||
%{_libdir}/xorg/modules/extensions/libextmod.la
|
||||
%{_libdir}/xorg/modules/extensions/libextmod.so
|
||||
%{_libdir}/xorg/modules/extensions/librecord.la
|
||||
%{_libdir}/xorg/modules/extensions/librecord.so
|
||||
#%{_libdir}/xorg/modules/extensions/libGLcore.la
|
||||
#%{_libdir}/xorg/modules/extensions/libGLcore.so
|
||||
#%{_libdir}/xorg/modules/extensions/libxtrap.la
|
||||
#%{_libdir}/xorg/modules/extensions/libxtrap.so
|
||||
#%{_libdir}/xorg/modules/extensions/librecord.la
|
||||
#%{_libdir}/xorg/modules/extensions/librecord.so
|
||||
#%{_libdir}/xorg/modules/fonts/*
|
||||
%dir %{_libdir}/xorg
|
||||
%dir %{_libdir}/xorg/modules
|
||||
%{_libdir}/xorg/modules/lib*.la
|
||||
%{_libdir}/xorg/modules/lib*.so
|
||||
#%{_libdir}/xorg/modules/linux/*
|
||||
%{_libdir}/xorg/modules/multimedia/*
|
||||
%{_libdir}/xorg/protocol.txt
|
||||
#%{_libdir}/xserver/SecurityPolicy
|
||||
%dir %{_datadir}/X11
|
||||
%dir %{_datadir}/X11/xorg.conf.d
|
||||
%{_datadir}/X11/xorg.conf.d/10-evdev.conf
|
||||
%{_mandir}/man1/Xnest.*
|
||||
%{_mandir}/man1/Xorg.*
|
||||
#%{_mandir}/man1/Xprt.*
|
||||
%{_mandir}/man1/Xserver.*
|
||||
%{_mandir}/man1/Xvfb.*
|
||||
%{_mandir}/man1/gtf.*
|
||||
#%{_mandir}/man1/pcitweak.*
|
||||
#%{_mandir}/man1/scanpci.*
|
||||
#%{_mandir}/man1/xorgcfg.*
|
||||
#%{_mandir}/man1/xorgconfig.*
|
||||
%{_mandir}/man4/exa.*
|
||||
%{_mandir}/man4/fbdevhw.*
|
||||
%{_mandir}/man5/xorg.conf.*
|
||||
%{_mandir}/man5/xorg.conf.d.*
|
||||
#%{_mandir}/man5/SecurityPolicy.*
|
||||
%{_mandir}/man1/cvt.*
|
||||
%{_datadir}/X11/xorg.conf.d/10-quirks.conf
|
||||
%{_mandir}/man1/cvt.1*
|
||||
%{_mandir}/man1/gtf.1*
|
||||
%{_mandir}/man1/Xnest.1*
|
||||
%{_mandir}/man1/Xorg.1*
|
||||
%{_mandir}/man1/Xserver.1*
|
||||
%{_mandir}/man1/Xvfb.1*
|
||||
%{_mandir}/man4/exa.4*
|
||||
%{_mandir}/man4/fbdevhw.4*
|
||||
%{_mandir}/man5/xorg.conf.5*
|
||||
%{_mandir}/man5/xorg.conf.d.5*
|
||||
%doc COPYING
|
||||
|
||||
%files dmx
|
||||
@ -298,40 +264,70 @@ exit 0
|
||||
%{_bindir}/dmxwininfo
|
||||
%{_bindir}/vdltodmx
|
||||
%{_bindir}/xdmxconfig
|
||||
%{_mandir}/man1/Xdmx.*
|
||||
%{_mandir}/man1/dmxtodmx.*
|
||||
%{_mandir}/man1/vdltodmx.*
|
||||
%{_mandir}/man1/xdmxconfig.*
|
||||
%{_mandir}/man1/Xdmx.1*
|
||||
%{_mandir}/man1/dmxtodmx.1*
|
||||
%{_mandir}/man1/vdltodmx.1*
|
||||
%{_mandir}/man1/xdmxconfig.1*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
#%{_includedir}/X11/bitmaps/*
|
||||
#%{_includedir}/X11/pixmaps/*
|
||||
%dir %{_includedir}/xorg
|
||||
%{_includedir}/xorg/*.h
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_datadir}/aclocal/xorg-server.m4
|
||||
%dir %{_docdir}/xorg-server
|
||||
%{_docdir}/xorg-server/Xserver-DTrace*
|
||||
|
||||
%files -n xorg-ext-libglx
|
||||
%defattr(-,root,root)
|
||||
%dir %{_libdir}/xorg/modules/extensions
|
||||
%{_libdir}/xorg/modules/extensions/libglx.la
|
||||
%{_libdir}/xorg/modules/extensions/libglx_dri_so
|
||||
|
||||
%changelog
|
||||
* Sat Jul 27 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 1.12.4-5mamba
|
||||
- arm: rebuilt to fix 'symbol lookup error: X: undefined symbol: __aeabi_ui2d'
|
||||
* Mon Apr 14 2014 Automatic Build System <autodist@mambasoft.it> 1.15.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Jun 26 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 1.12.4-4mamba
|
||||
- rebuild using ld.bfd (add check and exit if ld is gold)
|
||||
* Mon Feb 10 2014 Automatic Build System <autodist@mambasoft.it> 1.15.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Jun 25 2013 openmamba WebBuild System <webbuild@openmamba.org> 1.12.4-3mamba
|
||||
- really install Xorg mode 4755
|
||||
* Sat Aug 24 2013 Automatic Build System <autodist@mambasoft.it> 1.14.99.1-1mamba
|
||||
- automatic update by autodist
|
||||
|
||||
* Tue Jun 18 2013 openmamba WebBuild System <webbuild@openmamba.org> 1.12.4-2mamba
|
||||
- install Xorg mode 4755 to run X as non-root user
|
||||
* Thu Jun 27 2013 Automatic Build System <autodist@mambasoft.it> 1.14.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Mar 05 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 1.12.4-1mamba
|
||||
- update to 1.12.4
|
||||
* Wed Apr 17 2013 Automatic Build System <autodist@mambasoft.it> 1.14.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Mar 11 2013 Automatic Build System <autodist@mambasoft.it> 1.14.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Feb 28 2013 Automatic Build System <autodist@mambasoft.it> 1.13.99.902-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Jan 14 2013 Automatic Build System <autodist@mambasoft.it> 1.13.99.901-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Dec 14 2012 Automatic Build System <autodist@mambasoft.it> 1.13.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Dec 07 2012 Automatic Build System <autodist@mambasoft.it> 1.13.0.902-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Nov 24 2012 Automatic Build System <autodist@mambasoft.it> 1.13.0.901-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Sep 06 2012 Automatic Build System <autodist@mambasoft.it> 1.13.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Aug 22 2012 Automatic Build System <autodist@mambasoft.it> 1.12.99.905-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Aug 18 2012 Automatic Build System <autodist@mambasoft.it> 1.12.99.904-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Jul 11 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 1.12.3-2mamba
|
||||
- really remove xorg -configure patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user