[xorg-x11-drv-synaptics] Align git snapshot building with other drivers

Peter Hutterer whot at fedoraproject.org
Sun Aug 5 04:43:13 UTC 2012


commit 407d357aad581822615e6aa1d566fd21ef457850
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sun Aug 5 14:45:55 2012 +1000

    Align git snapshot building with other drivers

 xorg-x11-drv-synaptics.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 77d7241..70f6dc7 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -8,19 +8,20 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.6.2
-Release:        3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Release:        4%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
 
 %if 0%{?gitdate}
 Source0:        %{tarball}-%{gitdate}.tar.bz2
+Source1:        make-git-snapshot.sh
+Source2:        commitid
 %else
 Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 %endif
-Source1:        50-synaptics.conf
-Source2:        make-git-snapshot.sh
-Source3:        70-touchpad-quirks.rules
+Source3:        50-synaptics.conf
+Source4:        70-touchpad-quirks.rules
 
 ExcludeArch:    s390 s390x %{?rhel:ppc ppc64}
 
@@ -95,10 +96,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/50-synaptics.conf
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/50-synaptics.conf
 
 install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-touchpad-quirks.rules
+install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-touchpad-quirks.rules
 
 
 %clean
@@ -135,6 +136,9 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Sun Aug 05 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.6.2-4
+- Align git snapshot building with other drivers
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list