commit 451d7d7838d508f1277062dff3da5b441504c59e
Author: Jakub Bogusz <[email protected]>
Date: Tue Feb 12 19:58:27 2013 +0100
- updated to 1.0.5
- old configdir patch became obsolete, replaced by new one
- removed obsolete install patch
xorg-app-rstart-configdir.patch | 34 +++++++++++++++++-----------------
xorg-app-rstart-install.patch | 21 ---------------------
xorg-app-rstart.spec | 34 +++++++++-------------------------
3 files changed, 26 insertions(+), 63 deletions(-)
---
diff --git a/xorg-app-rstart.spec b/xorg-app-rstart.spec
index b673b84..1bab4b2 100644
--- a/xorg-app-rstart.spec
+++ b/xorg-app-rstart.spec
@@ -1,14 +1,13 @@
Summary: rstart and rstartd applications - Remote Start client and helper
Summary(pl.UTF-8): Aplikacje rstart i rstartd - klient i program do
zdalnego uruchamiania
Name: xorg-app-rstart
-Version: 1.0.4
+Version: 1.0.5
Release: 1
License: MIT
Group: X11/Applications
Source0:
http://xorg.freedesktop.org/releases/individual/app/rstart-%{version}.tar.bz2
-# Source0-md5: eb82a6290dfbaa1fc09a3b7426b2eac2
+# Source0-md5: 960f4fa5e7e87ae05febd02e9e96d158
Patch0: %{name}-configdir.patch
-Patch1: %{name}-install.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -45,7 +44,9 @@ rstartd to implementacja programu pomocniczego ("helpera")
opisanego w
%prep
%setup -q -n rstart-%{version}
%patch0 -p1
-%patch1 -p1
+
+# workaround unnecessary AC_CONFIG_MACRO_DIR([m4]) in configure.ac
+mkdir m4
%build
%{__aclocal}
@@ -57,16 +58,13 @@ rstartd to implementacja programu pomocniczego ("helpera")
opisanego w
--with-default-man-path="/usr/share/man:/usr/local/man" \
--with-default-user-path="/usr/local/bin:/usr/bin:/bin"
-%{__make} \
- configdir=/etc/X11/rstart
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- configdir=/etc/X11/rstart \
- DATA_DIR=/etc/X11/rstart
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -78,23 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rstartd
%dir %{_libdir}/X11/rstart
%attr(755,root,root) %{_libdir}/X11/rstart/rstartd.real
+%{_libdir}/X11/rstart/commands
+%{_libdir}/X11/rstart/contexts
%dir /etc/X11/rstart
%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/config
-%dir /etc/X11/rstart/commands
-%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/commands/@List
-%config(noreplace) %verify(not md5 mtime size)
/etc/X11/rstart/commands/ListContexts
-%config(noreplace) %verify(not md5 mtime size)
/etc/X11/rstart/commands/ListGenericCommands
-%dir /etc/X11/rstart/commands/x11r6
-%config(noreplace) %verify(not md5 mtime size)
/etc/X11/rstart/commands/x11r6/@List
-%config(noreplace) %verify(not md5 mtime size)
/etc/X11/rstart/commands/x11r6/LoadMonitor
-%config(noreplace) %verify(not md5 mtime size)
/etc/X11/rstart/commands/x11r6/Terminal
-%config(noreplace,missingok) %verify(not link) /etc/X11/rstart/commands/x11
-%config(noreplace,missingok) %verify(not link) /etc/X11/rstart/commands/x
-%dir /etc/X11/rstart/contexts
-%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/contexts/@List
-%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/contexts/default
-%config(noreplace) %verify(not md5 mtime size) /etc/X11/rstart/contexts/x11r6
-%config(noreplace,missingok) %verify(not link) /etc/X11/rstart/contexts/x11
-%config(noreplace,missingok) %verify(not link) /etc/X11/rstart/contexts/x
%{_mandir}/man1/rstart.1x*
%{_mandir}/man1/rstartd.1x*
diff --git a/xorg-app-rstart-configdir.patch b/xorg-app-rstart-configdir.patch
index 6d20f2a..7dc35ca 100644
--- a/xorg-app-rstart-configdir.patch
+++ b/xorg-app-rstart-configdir.patch
@@ -1,22 +1,22 @@
---- rstart-1.0.4/Makefile.am.orig 2010-10-30 23:36:38.000000000 +0200
-+++ rstart-1.0.4/Makefile.am 2010-10-31 08:10:53.471723445 +0100
-@@ -24,9 +24,10 @@
- rstart_serverdir = $(libdir)/X11/rstart
- rstart_server_PROGRAMS = rstartd.real
+--- rstart-1.0.5/scripts/Makefile.am.orig 2013-02-11 03:18:02.000000000
+0100
++++ rstart-1.0.5/scripts/Makefile.am 2013-02-12 19:26:29.619302780 +0100
+@@ -1,7 +1,7 @@
-+configdir = $(libdir)/X11/rstart
- AM_CFLAGS = $(CWARNFLAGS) $(RSTART_CFLAGS) \
- -DSERVERNAME=\"rstart\" \
-- -DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\"
-+ -DDEFAULT_CONFIG=\"$(configdir)/config\"
-
- rstartd_real_LDADD = $(RSTART_LIBS)
+ # config data
-@@ -51,7 +52,6 @@
+-rstart_DATA = config
++config_DATA = config
+ dist_noinst_DATA = config.in
- # config data
+ CONFIG_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g'
+--- rstart-1.0.5/configure.ac.orig 2013-02-11 03:18:02.000000000 +0100
++++ rstart-1.0.5/configure.ac 2013-02-12 19:52:22.409237614 +0100
+@@ -47,7 +47,7 @@
+ AC_SUBST([rstartdir],[$libdir/X11/rstart])
--configdir = $(libdir)/X11/rstart
- config_DATA = config
+ # Define the root directory for config
+-AC_SUBST([configdir],[$(sysconfdir)/X11/rstart])
++AC_SUBST([configdir],[${sysconfdir}/X11/rstart])
- config: config.cpp
+ # Obtain compiler options from depedencies
+ PKG_CHECK_MODULES(RSTART, xproto)
diff --git a/xorg-app-rstart-install.patch b/xorg-app-rstart-install.patch
deleted file mode 100644
index d10aaf7..0000000
--- a/xorg-app-rstart-install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- rstart-1.0.2/Makefile.am.orig 2006-10-15 15:27:26.815305250 +0200
-+++ rstart-1.0.2/Makefile.am 2006-10-15 15:27:36.831931250 +0200
-@@ -136,14 +136,14 @@
- done; \
- ); \
- \
-- cd $(DESTDIR)$(DATA_DIR)/contexts; \
-- sed -e '/^$$/d' -e '/^#/d' @Aliases | \
-+ abssrcdir="`pwd`" ; cd $(DESTDIR)$(DATA_DIR)/contexts; \
-+ sed -e '/^$$/d' -e '/^#/d' $${abssrcdir}/contexts/@Aliases | \
- while read real aliases; do \
- for i in $$aliases; do \
- $(RM) $$i; \
- $(LN) $$real $$i; \
-- $(RM) $(DESTDIR)$(rstart_serverdir)/commands/$$i; \
-- $(LN) $$real $(DESTDIR)$(rstart_serverdir)/commands/$$i; \
-+ $(RM) $(DESTDIR)$(DATA_DIR)/commands/$$i; \
-+ $(LN) $$real
$(DESTDIR)$(DATA_DIR)/commands/$$i; \
- done; \
- done; \
- $(RM) @Aliases
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-rstart.git/commitdiff/451d7d7838d508f1277062dff3da5b441504c59e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
