Add penmount touchscreen configuration file

[profile/ivi/xorg-x11-server.git] / packaging / xorg-x11-server.spec

diff --git a/packaging/xorg-x11-server.spec b/packaging/xorg-x11-server.spec
index 74e8220..2588abf 100644 (file)
--- a/packaging/xorg-x11-server.spec
+++ b/packaging/xorg-x11-server.spec
@@ -7,9 +7,11 @@ Group:      System/X11
 License:    MIT
 URL:        http://www.x.org
 Source0:    %{name}-%{version}.tar.gz
-Source100:  10-kbd.conf
-Source101:  10-mouse.conf
+Source100:  95-input-penmount-tslib.conf  
+Source101:  99-calibration.conf
 Source102:  64-xorg-xkb.rules
+Source103:  50-kbd.conf
+Source104:  51-mouse.conf
 Source200:  videoabiver
 Source201:  inputabiver
 Source202:  serverminver
@@ -61,8 +63,6 @@ Provides: xorg-x11-server-Xorg
 %description
 Description: %{summary}
 
-
-
 %package devel
 Summary:    SDK for X server driver module development
 Group:      System/X11
@@ -87,14 +87,9 @@ Requires:   %{name} = %{version}-%{release}
 %description common
 Common files shared among all X servers.
 
-
-
-
 %prep
 %setup -q -n %{name}-%{version}
 
-
-
 %build
 
 %reconfigure \
@@ -157,8 +152,8 @@ Common files shared among all X servers.
        --disable-kdrive-evdev \
        --without-dtrace \
        --with-os-vendor="Tizen" \
-       --with-xkb-path=/opt/etc/X11/xkb \
-       --with-xkb-output=/opt/etc/X11/xkb \
+       --with-xkb-path=/etc/X11/xkb \
+       --with-xkb-output=/etc/X11/xkb \
        --with-default-font-path="built-ins" \
        --disable-install-setuid \
        --with-sha1=libgcrypt \
@@ -172,6 +167,13 @@ Common files shared among all X servers.
 make %{?jobs:-j%jobs}
 
 %install
+
+mkdir -p %{buildroot}/etc/X11/xorg.conf.d/
+install -m 755 -D %{SOURCE100} %{buildroot}/etc/X11/xorg.conf.d/
+install -m 755 -D %{SOURCE101} %{buildroot}/etc/X11/xorg.conf.d/
+install -m 755 -D %{SOURCE103} %{buildroot}/etc/X11/xorg.conf.d/
+install -m 755 -D %{SOURCE104} %{buildroot}/etc/X11/xorg.conf.d/
+
 %make_install
 
 rm -f %{buildroot}/usr/lib/xorg/modules/multimedia/*
@@ -181,8 +183,7 @@ rm -f %{buildroot}/usr/lib/xorg/modules/libwfb.so
 rm -f %{buildroot}/usr/lib/xorg/modules/libxaa.so
 rm -f %{buildroot}/usr/lib/xorg/modules/libwfb.so
 rm -f %{buildroot}/usr/lib/xorg/modules/libxf8_16bpp.so
-rm -f %{buildroot}/opt/etc/X11/xkb/README.compiled
-
+rm -f %{buildroot}/etc/X11/xkb/README.compiled
 
 %remove_docs
 
@@ -199,14 +200,13 @@ rm -f %{buildroot}/opt/etc/X11/xkb/README.compiled
 /usr/lib/xorg/modules/extensions/libglx.so
 /usr/lib/xorg/modules/extensions/libdbe.so
 /usr/lib/xorg/modules/extensions/libdri.so
+/etc/X11/xorg.conf.d/*
 %endif
 %{_libdir}/xorg/modules/extensions/libextmod.so
 %{_libdir}/xorg/modules/extensions/librecord.so
 %dir %{_libdir}/xorg/modules/multimedia
 %{_libdir}/xorg/modules/*.so
 
-
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/xorg-server.pc
@@ -218,4 +218,3 @@ rm -f %{buildroot}/opt/etc/X11/xkb/README.compiled
 %files common
 %defattr(-,root,root,-)
 %{_libdir}/xorg/protocol.txt
-