W załączniku patch do linuxwacom zawierający: - podbicie do nowszej wersji, - usunięcie sterowników dla xorg, - zmiany w BuildRequires, Suggests i opisie związane z podbiciem wersji i rozdzieleniem pakietów, oraz spec do nowego sterownika xorg dla tabletów wacom. Trochę informacji dlaczego jest tak a nie inaczej tutaj: http://old.nabble.com/linuxwacom-and-xf86-input-wacom-plan-td25760339.html
Jak zwykle proszę o komentarze, mogą być złośliwe, byle były celne ;-) -- Przemo
--- linuxwacom.spec 2009-04-12 13:33:54.000000000 +0100 +++ ~linuxwacom.spec 2009-11-08 13:01:55.000000000 +0000 @@ -15,12 +15,12 @@ Summary: Wacom Drivers from Linux Wacom Project Summary(pl.UTF-8): Sterowniki Wacom z projektu Linux Wacom Project Name: linuxwacom -Version: 0.8.3 +Version: 0.8.5 Release: 1 License: GPL/X11 Group: X11 -Source0: http://dl.sourceforge.net/linuxwacom/%{name}-%{version}-2.tar.bz2 -# Source0-md5: 3126718ca78a0c35c3d62d25817c8ece +Source0: http://dl.sourceforge.net/linuxwacom/%{name}-%{version}-1.tar.bz2 +# Source0-md5: 03d1714fcd2f55914b08f8e6fdd71652 Source1: %{name}-rules URL: http://linuxwacom.sourceforge.net/ %if %{with kernel} @@ -30,6 +30,7 @@ %if %{with userspace} BuildRequires: autoconf BuildRequires: automake +BuildRequires: hal-devel >= 0.5.0 BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: tcl-devel @@ -41,6 +42,7 @@ %endif Requires: udev-core >= 030-21 Requires: xorg-xserver-server +Suggests: xorg-driver-input-wacom #ExclusiveArch: %{ix86} %{x8664} alpha ia64 ppc sparc sparc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -49,13 +51,12 @@ %description The Linux Wacom Project manages the drivers, libraries, and documentation for configuring and running Wacom tablets under the -Linux operating system. It contains diagnostic applications as well as -X.org XInput drivers. +Linux operating system. It contains diagnostic applications. %description -l pl.UTF-8 -Linux Wacom Project utrzymuje sterowniki, biblioteki i dokumentację -do konfigurowania i uruchamiania tabletów Wacom pod systemem Linux. -Zawiera aplikacje diagnostyczne, a także sterowniki XInput do X.org. +Linux Wacom Project utrzymuje sterowniki, biblioteki i dokumentację do +konfigurowania i uruchamiania tabletów Wacom pod systemem Linux. +Zawiera aplikacje diagnostyczne. %package devel Summary: linuxwacom developmental header files @@ -84,18 +85,11 @@ Statyczna biblioteka linuxwacom. %prep -%setup -q -n %{name}-%{version}-2 - -cat > src/2.6.19/Makefile << EOF -obj-m += wacom.o -wacom-objs := wacom_wac.o wacom_sys.o -%{?debug:CFLAGS += -DCONFIG_MODULE_NAME_DEBUG=1} -EOF -cp src/2.6.1{6,9}/wacom_wac.h +%setup -q -n %{name}-%{version}-1 %build %if %{with kernel} -%build_kernel_modules -C src/2.6.19 -m wacom +%build_kernel_modules -C src/2.6.31 -m wacom %endif %if %{with userspace} @@ -110,6 +104,7 @@ #fi export CFLAGS="-I/usr/include/ncurses %{rpmcflags}" %configure \ + --libexecdir=%{_libexecdir}/hal \ --with-gtk \ --with-tcl \ --with-tk \ @@ -124,7 +119,7 @@ --enable-libwacomcfg \ --enable-xsetwacom \ --enable-tabletdev \ - --enable-wacomdrv + --disable-wacomdrv # --enable-xserver64 Use specified X server bit [default=usually] # --enable-mkxincludes Enable mkxincludes, XF86 dependency builder [default=no] %{__make} @@ -144,7 +139,7 @@ %endif %if %{with kernel} -%install_kernel_modules -m src/2.6.19/wacom -d misc +%install_kernel_modules -m src/2.6.31/wacom -d misc %endif %clean @@ -157,7 +152,7 @@ %defattr(644,root,root,755) %if %{with userspace} %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README NEWS +%doc AUTHORS ChangeLog README %attr(755,root,root) %{_bindir}/wacdump %attr(755,root,root) %{_bindir}/wacomcpl* %attr(755,root,root) %{_bindir}/xidump @@ -168,18 +163,10 @@ %{_libdir}/TkXInput/pkgIndex.tcl %{_mandir}/man4/*.4* %attr(755,root,root) %{_libdir}/libwacomcfg.so.0 -%attr(755,root,root) %{_libdir}/xorg/modules/input/wacom_drv.so %{_sysconfdir}/udev/rules.d/10-wacom.rules -%{_libdir}/hal-setup-wacom +%attr(755,root,root) %{_libexecdir}/hal/hal-setup-wacom %{_datadir}/hal/fdi/policy/20thirdparty/10-linuxwacom.fdi -#%%files tk -#%attr(755,root,root) %{_bindir}/wacomcpl -#%attr(755,root,root) %{_bindir}/wacomcpl-exec -#%dir %{_libdir}/TkXInput -#%attr(755,root,root) %{_libdir}/TkXInput/libwacomxi.so* -#%{_libdir}/TkXInput/pkgIndex.tcl - %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libwacomcfg*.so
# $Revision:$, $Date:$ Summary: X.org input driver for Wacom tablets Summary(pl.UTF-8): Sterownik wejściowy X.org dla tabletów Wacom Name: xorg-driver-input-wacom Version: 0.9.1 Release: 1 License: GPL Group: X11/Applications Source0: http://cgit.freedesktop.org/~whot/xf86-input-wacom/snapshot/xf86-input-wacom-%{version}.tar.bz2 # Source0-md5: e4fc2ee50322c24abbaca1478af7002b URL: http://xorg.freedesktop.org/ BuildRequires: autogen BuildRequires: automake BuildRequires: pkg-config BuildRequires: xorg-xserver-server-devel %requires_xorg_xserver_xinput BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description X.org input driver for Wacom tablets. %description -l pl.UTF-8 Sterownik wejściowy X.org dla tabletów Wacom %package devel Summary: Header file for wacom driver Summary(pl.UTF-8): Plik nagłówkowy sterownika wacom Group: Development/Libraries %description devel %description devel -l pl.UTF-8P Plik nagłówkowy sterownika wacom %prep %setup -q -n xf86-input-wacom-%{version} %build %{__libtoolize} %{__aclocal} %{__autoconf} %{__autoheader} %{__automake} %configure %{__make} %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS README %attr(755,root,root) %{_libdir}/xorg/modules/input/wacom_drv.* %{_mandir}/man4/wacom.4* %files devel %defattr(644,root,root,755) %{_includedir}/xorg/Xwacom.h %{_pkgconfigdir}/xorg-wacom.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log:$
_______________________________________________ pld-devel-pl mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
