From: Sung-Jin Park <sj76.park@samsung.com>
Date: Wed, 22 Mar 2017 05:15:42 +0000 (+0900)
Subject: packaging: update packaging file to install license file via %license macro
X-Git-Tag: accepted/tizen/7.0/unified/20221110.062241~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ba16c64dedff0eaed094f25974cb63934852e98;p=platform%2Fupstream%2Flibevdev.git

packaging: update packaging file to install license file via %license macro

Change-Id: I747b1019f81b98851f43079bed674f0bff40c126
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
---

diff --git a/packaging/libevdev.spec b/packaging/libevdev.spec
index 541b0f2..cf03ffc 100644
--- a/packaging/libevdev.spec
+++ b/packaging/libevdev.spec
@@ -42,10 +42,6 @@ make %{?jobs:-j%jobs} V=1
 %make_install
 #%fdupes %{buildroot}
 
-# for license notification
-mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license
-cp -a %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -54,7 +50,7 @@ cp -a %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/licens
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%{TZ_SYS_RO_SHARE}/license/%{name}
+%license COPYING
 %{_bindir}/touchpad-edge-detector
 %{_libdir}/*.so.*
 %{_datadir}/*
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 86222f7..ba714d5 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,9 +1,11 @@
-noinst_PROGRAMS = libevdev-events
-bin_PROGRAMS = \
+<<<<<<< HEAD
+noinst_PROGRAMS = libevdev-events \
 	       touchpad-edge-detector \
 	       mouse-dpi-tool \
 	       libevdev-tweak-device
 
+#bin_PROGRAMS = 
+
 AM_CPPFLAGS = $(GCC_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/libevdev
 libevdev_ldadd = $(top_builddir)/libevdev/libevdev.la