summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjk7744.park <jk7744.park@samsung.com>2015-02-01 14:09:41 +0900
committerjk7744.park <jk7744.park@samsung.com>2015-02-01 14:09:41 +0900
commitf8794ecded46aa92ae4b4feb44f50f05d30bbff6 (patch)
tree8620a6da98338fb1dc2f4b3f9469f6bb063098a3
parent2e89f8dc14fddeee1af1ce3f56032d44c73d573c (diff)
downloadx11-xserver-utils-tizen_2.3.tar.gz
x11-xserver-utils-tizen_2.3.tar.bz2
x11-xserver-utils-tizen_2.3.zip
-rwxr-xr-xpackaging/xorg-x11-server-utils.spec24
-rw-r--r--xorg-x11-server-utils.manifest9
2 files changed, 13 insertions, 20 deletions
diff --git a/packaging/xorg-x11-server-utils.spec b/packaging/xorg-x11-server-utils.spec
index 9a66ca7..6190d47 100755
--- a/packaging/xorg-x11-server-utils.spec
+++ b/packaging/xorg-x11-server-utils.spec
@@ -6,13 +6,12 @@
Summary: X.Org X11 X server utilities
Name: xorg-x11-server-utils
-Version: 7.5
+Version: 7.5.1
Release: 12
License: MIT
Group: User Interface/X
URL: http://www.x.org
Source0: %{name}-%{version}.tar.gz
-Source1: xmodmap.service
Source2: xrdb.service
Source3: xset-autorepeat-lb.service
Source4: xset-autorepeat-i386.service
@@ -29,7 +28,7 @@ BuildRequires: xorg-x11-xutils-dev
#BuildRequires: pkgconfig(xorg-macros)
BuildRequires: pkgconfig(xmu) pkgconfig(xext) pkgconfig(xrandr)
BuildRequires: pkgconfig(xxf86vm) pkgconfig(xrender) pkgconfig(xi)
-BuildRequires: pkgconfig(xt) pkgconfig(xpm)
+BuildRequires: pkgconfig(xt)
# xsetroot requires xbitmaps-devel (which was renamed now)
BuildRequires: xorg-x11-xbitmaps
# xsetroot
@@ -43,7 +42,7 @@ BuildRequires: libXinerama-devel
# a) universally useful and b) don't require Xaw
#Conflicts: xorg-x11-apps < 7.6-4
-%define DEF_SUBDIRS iceauth rgb sessreg xgamma xhost xkill xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer xsetroot xstdcmap
+%define DEF_SUBDIRS xkill xrandr xrdb xset
Provides: %{DEF_SUBDIRS}
Provides: x11-xserver-utils = %{version}
@@ -114,11 +113,9 @@ cp -af COPYING %{buildroot}/usr/share/license/%{name}
}
mkdir -p %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants
-install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/user/
install -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/user/
install -m 0644 %SOURCE3 %{buildroot}%{_libdir}/systemd/user/
install -m 0644 %SOURCE4 %{buildroot}%{_libdir}/systemd/user/
-ln -s ../xmodmap.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/xmodmap.service
ln -s ../xrdb.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/xrdb.service
ln -s ../xset-autorepeat-lb.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/xset-autorepeat-lb.service
ln -s ../xset-autorepeat-i386.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/xset-autorepeat-i386.service
@@ -129,28 +126,15 @@ ln -s ../xset-autorepeat-i386.service %{buildroot}%{_libdir}/systemd/user/core-e
rm -rf $RPM_BUILD_ROOT
%files
+%manifest xorg-x11-server-utils.manifest
%defattr(-,root,root,-)
/usr/share/license/%{name}
%doc
-%{_bindir}/iceauth
-%{_bindir}/sessreg
-%{_bindir}/showrgb
-%{_bindir}/xgamma
-%{_bindir}/xhost
%{_bindir}/xkill
-%{_bindir}/xmodmap
%{_bindir}/xrandr
%{_bindir}/xrdb
-%{_bindir}/xrefresh
%{_bindir}/xset
-%{_bindir}/xsetmode
-%{_bindir}/xsetpointer
-%{_bindir}/xsetroot
-%{_bindir}/xstdcmap
-%{_datadir}/X11/rgb.txt
-%{_libdir}/systemd/user/xmodmap.service
%{_libdir}/systemd/user/xrdb.service
-%{_libdir}/systemd/user/core-efl.target.wants/xmodmap.service
%{_libdir}/systemd/user/core-efl.target.wants/xrdb.service
%if %{with_xkeystone}
diff --git a/xorg-x11-server-utils.manifest b/xorg-x11-server-utils.manifest
new file mode 100644
index 0000000..7f541e8
--- /dev/null
+++ b/xorg-x11-server-utils.manifest
@@ -0,0 +1,9 @@
+<manifest>
+ <request>
+ <domain name="_"/>
+ </request>
+ <assign>
+ <filesystem path="/usr/bin/*" label="_" exec_label="none" />
+ </assign>
+</manifest>
+