rpms/xorg-x11-drv-tek4957/devel xorg-x11-drv-tek4957.spec,1.8,1.9

Adam Jackson (ajax) fedora-extras-commits at redhat.com
Mon Jun 18 19:55:57 UTC 2007


Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-tek4957/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30505

Modified Files:
	xorg-x11-drv-tek4957.spec 
Log Message:
* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 1.1.0-3
- Update Requires and BuildRequires.  Disown the module directories.  Use
  explicit filename instead of glob.



Index: xorg-x11-drv-tek4957.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-tek4957/devel/xorg-x11-drv-tek4957.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-tek4957.spec	16 Feb 2007 21:50:35 -0000	1.8
+++ xorg-x11-drv-tek4957.spec	18 Jun 2007 19:55:22 -0000	1.9
@@ -1,29 +1,23 @@
 %define tarball xf86-input-tek4957
-# All packages should own all dirs they lead up to, for saner
-# rpm packaging, in particular if the leading dirs are not owned by
-# the "filesystem" package.
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
-# define driverdir to the appropriate type for this driver class
 %define driverdir	%{moduledir}/input
 
-%define cvsdate xxxxxxx
-
 Summary:   Xorg X11 tek4957 input driver
 Name:      xorg-x11-drv-tek4957
 Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch: s390 s390x
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+
+Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 %description 
 X.Org X11 tek4957 input driver.
 
@@ -36,9 +30,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
@@ -50,22 +41,14 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
-# FIXME: A glob is used here in the specfile template to make it easy to
-# generate spec files automatically.  When everything is in CVS, if you're
-# updating the spec file, please change the glob to a list of explicit
-# filenames, so that rpm tracks individual files, and we know when a new
-# one gets added.  Explicitly naming files also helps avoid random
-# unexpected .so files (or others) from getting included in a shipping
-# product.  Ditto for the manpages.
-%{driverdir}/*.so
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4x
+%{driverdir}/tek4957_drv.so
 %{_mandir}/man4/tek4957.4*
 
 %changelog
+* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 1.1.0-3
+- Update Requires and BuildRequires.  Disown the module directories.  Use
+  explicit filename instead of glob.
+
 * Fri Feb 16 2007 Adam Jackson <ajax at redhat.com> 1.1.0-2
 - ExclusiveArch -> ExcludeArch
 




More information about the scm-commits mailing list