summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjk7744.park <jk7744.park@samsung.com>2015-10-24 17:28:36 +0900
committerjk7744.park <jk7744.park@samsung.com>2015-10-24 17:28:36 +0900
commitafe2051b05ec3cea1cbd5283565f00981cdf5615 (patch)
tree4f6b196c14bae583fa155d6e4895cb30a99a43b6
parent4d88910228dfcfa8f865f847ff7c45b248ccdb73 (diff)
downloadx11-xserver-utils-accepted/tizen_2.4_mobile.tar.gz
x11-xserver-utils-accepted/tizen_2.4_mobile.tar.bz2
x11-xserver-utils-accepted/tizen_2.4_mobile.zip
-rwxr-xr-xpackaging/xorg-x11-server-utils.spec7
-rw-r--r--packaging/xrdb.service13
2 files changed, 1 insertions, 19 deletions
diff --git a/packaging/xorg-x11-server-utils.spec b/packaging/xorg-x11-server-utils.spec
index 6eedac7..da452e8 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.1
+Version: 7.5.2
Release: 12
License: MIT
Group: User Interface/X
URL: http://www.x.org
Source0: %{name}-%{version}.tar.gz
-Source2: xrdb.service
Source3: xset-autorepeat-lb.service
Source4: xset-autorepeat-i386.service
@@ -113,10 +112,8 @@ cp -af COPYING %{buildroot}/usr/share/license/%{name}
}
mkdir -p %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants
-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 ../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
@@ -134,8 +131,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/xrandr
%{_bindir}/xrdb
%{_bindir}/xset
-%{_libdir}/systemd/user/xrdb.service
-%{_libdir}/systemd/user/core-efl.target.wants/xrdb.service
%if %{with_xkeystone}
%files -n xkeystone
diff --git a/packaging/xrdb.service b/packaging/xrdb.service
deleted file mode 100644
index c6692fd..0000000
--- a/packaging/xrdb.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Load X Resource database
-ConditionPathExists=/etc/X11/Xresources
-After=xorg.target
-Requires=xorg.target
-Before=e17_early.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/xrdb -load -nocpp /etc/X11/Xresources
-
-[Install]
-WantedBy=core-efl.target