Browse Source

build with xserver-1.8rc
add xorg.conf snippet


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@666 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 14 years ago
parent
commit
016bf10840
1 changed files with 16 additions and 3 deletions
  1. 16 3
      x/xorg-x11-drv-fpit/xorg-x11-drv-fpit-vl.spec

+ 16 - 3
x/xorg-x11-drv-fpit/xorg-x11-drv-fpit-vl.spec

@@ -6,25 +6,29 @@ Summary:   Xorg X11 fpit input driver
 Summary(ja):   Xorg X11 fpit 入力ドライバ
 Name:      xorg-x11-drv-fpit
 Version:   1.3.0
-Release:   1%{?_dist_release}
+Release:   2%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   10-fpit.conf
+
+Patch1:    fpit-1.3.0-abi.patch
 
 ExcludeArch: s390 s390x
 
-BuildRequires: xorg-x11-server-sdk >= 1.6
+BuildRequires: xorg-x11-server-sdk >= 1.7.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.7.99.901
 
 %description 
 X.Org X11 fpit input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -39,6 +43,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -46,8 +53,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{driverdir}/fpit_drv.so
 %{_mandir}/man4/fpit.4*
+%{_sysconfdir}/xorg.conf.d/10-fpit.conf
 
 %changelog
+* Thu Mar 25 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.0-2
+- rebuild with xserver-1.8rc
+  - add patch1 to build with xserver-1.8
+- add xorg.conf snippet
+
 * Mon Apr 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.0-1
 - new upstream release