Author: baggins Date: Sun Jul 18 01:15:55 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - pkgconfig for opengl libs - moved atieventsd to separate package
---- Files affected: packages/xorg-driver-video-fglrx: xorg-driver-video-fglrx.spec (1.180 -> 1.181) ---- Diffs: ================================================================ Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.180 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.181 --- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.180 Sat Jul 17 17:01:05 2010 +++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec Sun Jul 18 03:15:50 2010 @@ -1,8 +1,5 @@ # $Revision$, $Date$ # -# TODO: -# - properly package atieventsd and acpi stuff -# # Conditional build: %bcond_without dist_kernel # without distribution kernel %bcond_without kernel # don't build kernel modules @@ -31,7 +28,7 @@ %define arch_dir x86_64 %endif -%define rel 2 +%define rel 3 %define pname xorg-driver-video-fglrx Summary: Linux Drivers for ATI graphics accelerators Summary(pl.UTF-8): Sterowniki do akceleratorów graficznych ATI @@ -43,11 +40,15 @@ Group: X11 Source0: http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%(echo %{version} | tr . -)-x86.x86_64.run # Source0-md5: 089967a9aa86ad596884d82bb0b3a382 +Source1: atieventsd.init +Source2: atieventsd.sysconfig +Source3: gl.pc.in Patch0: %{pname}-kh.patch Patch1: %{pname}-smp.patch Patch2: %{pname}-x86genericarch.patch Patch3: fglrx-2.6.34-rc4.patch Patch4: %{pname}-desktop.patch +Patch5: %{pname}-nofinger.patch URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html %{?with_userspace:BuildRequires: OpenGL-GLU-devel} %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} @@ -147,6 +148,27 @@ Biblioteki statyczne do programowania z użyciem własnościowego sterownika ATI dla kart graficznych ATI Radeon. +%package atieventsd +Summary: ATI external events daemon +Summary(pl.UTF-8): Demon zezewnętrznych zdarzeń ATI +Group: Daemons +Requires: %{pname} = %{epoch}:%{version}-%{rel} +Requires: acpid +Requires(post,preun): /sbin/chkconfig +Requires: rc-scripts + +%description atieventsd +The ATI External Events Daemon is a user-level application +that monitors various system events such as ACPI or hotplug, +then notifies the driver via the X extensions interface that +the event has occured. + +%description atieventsd -l pl.UTF-8 +Demon zewnętrznych zdarzeń ATI jest aplikacją monitorującą +różne zdarzenia systemowe, takie jak ACPI lub hotplug, a +następnie informującą sterownik poprzez interfejs rozszerzeń X, +że zaszło zdarzenie. + %package -n kernel%{_alt_kernel}-video-firegl Summary: ATI kernel module for FireGL support Summary(pl.UTF-8): Moduł jądra oferujący wsparcie dla ATI FireGL @@ -176,6 +198,7 @@ %endif %patch3 -p1 %patch4 -p1 +%patch5 -p1 install -d common%{_prefix}/{%{_lib},bin,sbin} cp -r %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir} @@ -202,7 +225,12 @@ %if %{with userspace} install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{ati,env.d},%{_bindir},%{_sbindir}} \ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_datadir}/ati,%{_mandir}/man8} \ - $RPM_BUILD_ROOT{%{_libdir}/xorg/modules,%{_includedir}/{X11/extensions,GL}} + $RPM_BUILD_ROOT{%{_libdir}/xorg/modules,%{_includedir}/{X11/extensions,GL}} \ + $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} + +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/atieventsd +install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/atieventsd +cp -r common%{_datadir}/doc/fglrx/examples/etc/acpi $RPM_BUILD_ROOT/etc install common%{_bindir}/* $RPM_BUILD_ROOT%{_bindir} install common/usr/X11R6/bin/* $RPM_BUILD_ROOT%{_bindir} @@ -258,6 +286,10 @@ done %endif +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} +sed -e 's|@@prefix@@|%{_prefix}|g;s|@@libdir@@|%{_libdir}|g;s|@@includedir@@|%{_includedir}|g;s|@@version@@|%{version}|g' < %{SOURCE3} \ + > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc + %clean rm -rf $RPM_BUILD_ROOT @@ -271,6 +303,16 @@ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig +%post atieventsd +/sbin/chkconfig --add atieventsd +%service atieventsd restart + +%preun atieventsd +if [ "$1" = "0" ]; then + %service -q atieventsd stop + /sbin/chkconfig --del atieventsd +fi + %post -n kernel%{_alt_kernel}-video-firegl %depmod %{_kernel_ver} @@ -288,11 +330,10 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ati/atiogl.xml %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_sbindir}/* +%attr(755,root,root) %{_sbindir}/amdnotifyui %{_desktopdir}/*.desktop %{_pixmapsdir}/*.xpm %{_datadir}/ati -%{_mandir}/man8/*.8* %if %{with multigl} %ghost %{_libdir}/xorg/modules/extensions/libglx.so %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.%{version} @@ -349,6 +390,7 @@ %if %{with multigl} %attr(755,root,root) %{_libdir}/libGL.so %endif +%{_pkgconfigdir}/gl.pc %files static %defattr(644,root,root,755) @@ -356,6 +398,15 @@ %{_libdir}/libfglrx_gamma.a %endif +%files atieventsd +%defattr(644,root,root,755) +%attr(754,root,root) /etc/rc.d/init.d/atieventsd +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/atieventsd +%attr(755,root,root) %{_sbindir}/atieventsd +%attr(755,root,root) %{_sysconfdir}/acpi/ati-powermode.sh +%{_sysconfdir}/acpi/events/* +%{_mandir}/man8/atieventsd.8* + %if %{with kernel} %files -n kernel%{_alt_kernel}-video-firegl %defattr(644,root,root,755) @@ -368,6 +419,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.181 2010/07/18 01:15:50 baggins +- rel 3 +- pkgconfig for opengl libs +- moved atieventsd to separate package + Revision 1.180 2010/07/17 15:01:05 baggins - rel 2 - added TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.180&r2=1.181&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
