X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86-Servers.spec;h=24deb5f85dfce935ec678c3c5c6f847ca9260045;hb=refs%2Fheads%2FAC-branch;hp=a11eb16de73ac3f6c365532c1dc0b359597821cf;hpb=e1e2aadc0b863f161762461fb3ee2f7deca66433;p=packages%2FXFree86-Servers.git diff --git a/XFree86-Servers.spec b/XFree86-Servers.spec index a11eb16..24deb5f 100644 --- a/XFree86-Servers.spec +++ b/XFree86-Servers.spec @@ -1,13 +1,13 @@ Summary: XFree86 servers Name: XFree86-Servers Version: 3.3.6 -Release: 35 +Release: 36 License: MIT Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Source0: ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/X336src-1.tgz +# Source0-md5: bbfa360d10ce91ab37f24f197a31b485 Source1: ftp://ftp.dcs.ed.ac.uk/pub/jec/programs/xfsft/xfsft-1.1.6.tar.gz +# Source1-md5: 88c65d3c314dab6b000499861a7f4865 Source2: xserver.pamd Patch0: %{name}-rh.patch Patch1: %{name}-parallelmake.patch @@ -33,11 +33,13 @@ Patch20: %{name}-alpha.patch Patch21: %{name}-serversonly.patch Patch22: %{name}-sparc-asmflags.patch Patch23: %{name}-HasZlib.patch +Patch24: %{name}-period.patch ExclusiveArch: %{ix86} alpha m68k armv4l sparc BuildRequires: flex BuildRequires: bison BuildRequires: zlib-devel BuildRequires: pam-devel +Requires: pam >= 0.77.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -56,8 +58,6 @@ starych kart graficznych, nie obs Summary: The XFree86 servers - common files Summary(pl): Pliki wspólne dla serwerów XFree86 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Requires: XFree86-fonts Obsoletes: XFree86-Xserver @@ -69,10 +69,10 @@ but is not supported by XFree 4.x. If your card is well supported by XFree 4.x, use Xserver with appropriate driver from XFree 4.x instead. Please see the XFree86 video card/server list available from the -XFree86 Project's website at http://www.xfree86.org for a definitive +XFree86 Project's website at http://www.xfree86.org/ for a definitive list of X servers and which video cards they support. -%description -l pl common +%description common -l pl Pliki wspólne dla wszystkich X serwerów, w tym modu³y, Xwrapper oraz pliki konfiguracyjne PAM. Zainstaluj ten pakiet wraz z pakietem zawieraj±cym odpowiedni X serwer je¿eli masz star± kartê, która by³a @@ -81,14 +81,12 @@ Je u¿yj X serwera wraz z odpowiednim driverem z XFree 4.x Pe³n± listê X serwerów oraz kart które obs³uguj± mo¿na znale¼æ pod -adresem http://www.xfree86.org. +adresem http://www.xfree86.org/. %package -n XFree86-S3 Summary: The XFree86 server for video cards based on older S3 chips Summary(pl): Serwer XFree86 dla kart na starych uk³adach S3 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -100,7 +98,7 @@ motherboards with built-in graphics accelerators (such as the IBM ValuePoint line). Note that if you have an S3 ViRGE based video card, you'll need XFree86-S3V instead of XFree86-S3. -%description -l pl -n XFree86-S3 +%description -n XFree86-S3 -l pl XFree86-S3 jest X serwerem dla kart graficznych na uk³adach S3, czyli czê¶ci kart Number Nine, Diamond Stealth, Orchid Fahrenheit, Miro Crystal, STB. Je¿eli masz kartê na uk³adzie S3 ViRGE, zamiast tego @@ -110,8 +108,6 @@ pakietu zainstaluj XFree86-S3V. Summary: The XFree86 server for Number Nine Imagine 128 video cards Summary(pl): Serwer XFree86 dla kart Number Nine Imagine 128 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -119,7 +115,7 @@ Requires: %{name}-common = %{version} XFree86-I128 is the X server for the Number Nine Imagine 128 and similar video cards. -%description -l pl -n XFree86-I128 +%description -n XFree86-I128 -l pl XFree86-I128 jest X serwerem dla kart graficznych Number Nine Imagine 128 i podobnych. @@ -127,8 +123,6 @@ XFree86-I128 jest X serwerem dla kart graficznych Number Nine Imagine Summary: The XFree86 server for video cards based on the S3 Virge chip Summary(pl): Serwer XFree86 dla kart na uk³adzie S3 Virge Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -136,7 +130,7 @@ Requires: %{name}-common = %{version} XFree86-S3V is the X server for video cards based on the S3 ViRGE chipset. -%description -l pl -n XFree86-S3V +%description -n XFree86-S3V -l pl XFree86-S3V jest X serwerem dla kart graficznych opartych o uk³ady S3 ViRGE. @@ -144,8 +138,6 @@ ViRGE. Summary: The XFree86 server for Mach64 based video cards Summary(pl): Serwer XFree86 dla kart na uk³adzie Mach64 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -153,10 +145,10 @@ Requires: %{name}-common = %{version} XFree86-Mach64 is the server package for cards based on ATI's Mach64 chip, such as the Graphics Xpression, GUP Turbo, and WinTurbo cards. Note that this server is known to have problems with some Mach64 -cards. Check http://www.xfree86.org for current information on +cards. Check http://www.xfree86.org/ for current information on updating this server. -%description -l pl -n XFree86-Mach64 +%description -n XFree86-Mach64 -l pl XFree86-Mach64 to X serwer dla kart opartych o uk³ad ATI Mach64, takich jak Graphics Xpression, GUP Turbo, WinTurbo. Uwaga: ten serwer miewa problemy z niektórymi kartami Mach64. @@ -165,8 +157,6 @@ miewa problemy z niekt Summary: The XFree86 server program for older IBM 8514 or compatible video cards Summary(pl): Serwer XFree86 dla kart na uk³adzie IBM 8514 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -174,7 +164,7 @@ Requires: %{name}-common = %{version} The XFree86-8514 package contains the X server for older IBM 8514 video cards, or compatibles from a company such as ATI. -%description -l pl -n XFree86-8514 +%description -n XFree86-8514 -l pl XFree86-8514 zawiera X serwer dla starszych kart graficznych IBM 8514 lub kompatybilnych. @@ -182,8 +172,6 @@ lub kompatybilnych. Summary: The XFree86 server for AGX-based video cards Summary(pl): Serwer XFree86 dla kart na uk³adzie AGX Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -192,7 +180,7 @@ The XFree86-AGX package contains the X server for AGX-based cards, such as the Boca Vortex, Orchid Celsius, Spider Black Widow and Hercules Graphite. -%description -l pl -n XFree86-AGX +%description -n XFree86-AGX -l pl XFree86-AGX zawiera X serwer dla kart graficznych na uk³adzie AGX, takich jak Roca Vortex, Orchid Celsius, Spider Black Widow, Hercules Graphite. @@ -201,8 +189,6 @@ Graphite. Summary: The XFree86 server for Mach32 based video cards Summary(pl): Serwer XFree86 dla kart na uk³adzie Mach32 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -211,7 +197,7 @@ XFree86-Mach32 is the X server package for video cards built around ATI's Mach32 chip, including the ATI Graphics Ultra Pro and Ultra Plus. -%description -l pl -n XFree86-Mach32 +%description -n XFree86-Mach32 -l pl XFree86-Mach32 jest X serwerem dla kart graficznych opartych na uk³adzie ATI Mach32, w tym kart ATI Graphics Ultra Pro i Ultra Plus. @@ -219,8 +205,6 @@ uk Summary: The XFree86 server for Mach8 video cards Summary(pl): Serwer XFree86 dla kart na uk³adzie Mach8 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -228,7 +212,7 @@ Requires: %{name}-common = %{version} XFree86-Mach8 is the X server for video cards built around ATI's Mach8 chip, including the ATI 8514 Ultra and Graphics Ultra. -%description -l pl -n XFree86-Mach8 +%description -n XFree86-Mach8 -l pl XFree86-Mach8 jest X serwerem dla kart graficznych opartych na uk³adzie ATI Mach8, w tym kart ATI 8514 Ultra i Graphics Ultra. @@ -236,8 +220,6 @@ uk Summary: A generic XFree86 monochrome server for VGA cards Summary(pl): Serwer XFree86 dla kart VGA w trybie mono Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -246,7 +228,7 @@ XFree86-Mono is a generic monochrome (two color) server for VGA cards. XFree86-Mono will work for nearly all VGA compatible cards, but will only support a monochrome display. -%description -l pl -n XFree86-Mono +%description -n XFree86-Mono -l pl XFree86-Mono jest standardowym monochromatycznym (2-kolorowym) serwerem dla kart VGA. Dzia³a na prawie wszystkich kartach zgodnych z VGA. @@ -255,8 +237,6 @@ VGA. Summary: The XFree86 server for P9000 cards Summary(pl): Serwer dla kart na uk³adzie P9000 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -265,7 +245,7 @@ XFree86-P9000 is the X server for video cards built around the Weitek P9000 chip, such as most Diamond Viper cards and the Orchid P9000 card. -%description -l pl -n XFree86-P9000 +%description -n XFree86-P9000 -l pl XFree86-P9000 jest X serwerem dla kart graficznych opartych na uk³adzie Weitek P9000, takich jak Diamon Viper i Orchid P9000. @@ -273,8 +253,6 @@ uk Summary: An XFree86 server for most simple framebuffer SVGA devices Summary(pl): Serwer dla wiêkszo¶ci prostych kart SVGA Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -287,7 +265,7 @@ Genoa 8500VL, most Actix boards, and the Spider VLB Plus. This X server works for many other chips and cards, so try this server if you are having problems. -%description -l pl -n XFree86-SVGA +%description -n XFree86-SVGA -l pl X serwer dla wiêkszo¶ci prostych kart SVGA, w tym kart zbudowanych na uk³adach ET4000, Cirrus Logic, Chips and Technologies, Trident 8900 i 9000, Matrox. Dzia³a tak¿e na kartach Diamond Speedstar, Orchid @@ -298,8 +276,6 @@ wi Summary: A generic XFree86 server for VGA16 boards Summary(pl): Serwer XFree86 dla kart VGA w trybie 4bpp Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -308,7 +284,7 @@ XFree86-VGA16 is a generic 16 color server for VGA boards. XFree86-VGA16 will work on nearly all VGA style graphics boards, but will only support a low resolution, 16 color display. -%description -l pl -n XFree86-VGA16 +%description -n XFree86-VGA16 -l pl XFree86-VGA16 jest standardowych 16-kolorowym serwerem dla kart VGA. Dzia³a na prawie wszystkich kartach zgodnych z VGA. @@ -316,8 +292,6 @@ Dzia Summary: The XFree86 server for video cards based on ET4000/W32 chips Summary(pl): Serwer XFree86 dla kart na uk³adzie ET4000/W32 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -327,18 +301,16 @@ including the Genoa 8900 Phantom 32i, the Hercules Dynamite, the LeadTek WinFast S200, the Sigma Concorde, the STB LightSpeed, the TechWorks Thunderbolt, and the ViewTop PCI. -%description -l pl -n XFree86-W32 +%description -n XFree86-W32 -l pl XFree86-W32 jest X serwerem dla kart opartych na uk³adach ET4000/W32, w tym kart Genoa 8900 Phantom 32i, Hercules Dynamite, LeadTek WinFast S200, Sigma Concorde, STB LightSpeed, TechWorks Thunderbolt, ViewTop PCI. -%package -n XFree86-3DLabs +%package -n XFree86-3DLabs Summary: The XFree86 server for 3Dlabs video cards Summary(pl): Serwer XFree86 dla kart na uk³adzie 3Dlabs Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -348,7 +320,7 @@ Permedia chipsets, including the Glint 500TX with IBM RGB526 RAMDAC, the Glint MX with IBM RGB526 and IBM RGB640 RAMDAC, the Permedia with IBM RGB526 RAMDAC, and the Permedia 2 (classic, 2a, 2v). -%description -l pl -n XFree86-3DLabs +%description -n XFree86-3DLabs -l pl XFree86-3DLabs jest X serwerem dla kart graficznych na uk³adach 3Dlabs Glint lub Permedia, w tym Glint 500TX z RAMDAC IBM RGB526, Glint MX z RAMDAC IBM RGB526 lub IBM RGB640, Permedia z RAMDAC IBM RGB526 oraz @@ -358,8 +330,6 @@ Permedia 2 (classic, 2a, 2v). Summary: X server for systems with Digital TGA boards based on DC21040 chips Summary(pl): X serwer dla systemów z kartami Digital TGA na uk³adach DC21040 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -368,7 +338,7 @@ The XFree86-TGA package contains an 8-bit X server for Digital TGA boards based on the DC21040 chip. These adapters are often used in Alpha workstations and are included with Alpha UDB (Multia) machines. -%description -l pl -n XFree86-TGA +%description -n XFree86-TGA -l pl XFree86-TGA zawiea 8-bitowy X serwer dla kart Digital TGA opartych na uk³adzie DC21040. Te karty s± czêsto u¿ywane na w stacjach roboczych Alpha oraz maszynach Alpha UDB (Multia). @@ -377,8 +347,6 @@ Alpha oraz maszynach Alpha UDB (Multia). Summary: The X server for the generic frame buffer device on some machines Summary(pl): X serwer dzia³aj±cy w oparciu o framebuffer Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Provides: Xserver Requires: %{name}-common = %{version} @@ -398,7 +366,7 @@ in sync with the projection system, but the FBDev X server will always work. Thirdly, this X server can produce a larger display, at a higher resolution, for consoles on laptops. -%description -l pl -n XFree86-FBDev +%description -n XFree86-FBDev -l pl XFree86-FBDev zawiera X serwer oparty o framebuffer. Zazwyczaj jest jedynym dla maszyn SPARC, ale ma te¿ mo¿liwo¶ci przydatne na platformach intelowskich, zw³aszcza w laptopach. @@ -414,8 +382,6 @@ wi Summary: X server for Suns with monochrome and 8-bit color SBUS framebuffers Summary(pl): X serwer dla Sunów z framebufferem SBUS mono lub kolorowym 8bpp Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Obsoletes: X11R6.1-Sun Provides: Xserver Requires: %{name}-common = %{version} @@ -425,7 +391,7 @@ The XFree86-Sun package contains the X server for Sun computers with monochrome and 8-bit color SBUS frame buffers (for example, the CG3 and CG6 frame buffers). -%description -l pl -n XFree86-Sun +%description -n XFree86-Sun -l pl XFree86-Sun zawiera X serwer dla komputerów Sun z framebufferem SBUS monochromatycznym lub z 8-bitowym kolorem (np. CG3 lub CG6). @@ -433,8 +399,6 @@ monochromatycznym lub z 8-bitowym kolorem (np. CG3 lub CG6). Summary: X server for Sun computers with monochrome SBUS framebuffers only Summary(pl): X serwer dla Sunów z monochromatycznym framebufferem SBUS Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Obsoletes: X11R6.1-SunMono Provides: Xserver Requires: %{name}-common = %{version} @@ -443,16 +407,14 @@ Requires: %{name}-common = %{version} The XFree86-SunMono package includes an X server for Sun computers with monochrome SBUS frame buffers only. -%description -l pl -n XFree86-SunMono +%description -n XFree86-SunMono -l pl XFree86-SunMono zawiera X serwer dla komputerów Sun z monochromatycznym framebufferem SBUS. %package -n XFree86-Sun24 Summary: The X server for Suns with all supported SBUS framebuffers -Summary(pl): X serwer dla Sunów z framebufferami SBUS. +Summary(pl): X serwer dla Sunów z framebufferami SBUS Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Obsoletes: X11R6.1-Sun24 Provides: Xserver Requires: %{name}-common = %{version} @@ -461,7 +423,7 @@ Requires: %{name}-common = %{version} The XFree86-Sun24 package contains the X server for Sun computers with all supported SBUS frame buffers. -%description -l pl -n XFree86-Sun24 +%description -n XFree86-Sun24 -l pl XFree86-Sun24 zawiera X serwer dla komputerów Sun z framebufferem SBUS. @@ -471,7 +433,7 @@ SBUS. # install xfsft tar x -C xc/lib -f xfsft-1.1.6/libfont.tar patch -p0 -s -d xc/lib < xfsft-1.1.6/libfont.patch - + %patch0 -p1 %patch1 -p1 %patch2 -p0 @@ -517,6 +479,7 @@ patch -p0 -s -d xc/lib < xfsft-1.1.6/libfont.patch # fix cfb linking %patch22 -p1 %patch23 -p1 +%patch24 -p1 # Fix the header file for makedepend. cd xc/config/imake @@ -548,16 +511,14 @@ ln -sf ../../include/Xosdefs.h X11 %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{/etc/{pam.d,security/console.apps},%{_includedir}} -install -d $RPM_BUILD_ROOT/etc/pam.d install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver -install -d $RPM_BUILD_ROOT/etc/security/console.apps touch $RPM_BUILD_ROOT/etc/security/console.apps/xserver touch $RPM_BUILD_ROOT/etc/security/blacklist.xserver -install -d $RPM_BUILD_ROOT%{_includedir} - -%{__make} DESTDIR=$RPM_BUILD_ROOT install install.man -C xc +%{__make} install install.man -C xc \ + DESTDIR=$RPM_BUILD_ROOT # setup the default X server rm -f $RPM_BUILD_ROOT%{_bindir}/X