[packages/xorg-app-proxymngr] - updated to 1.0.3 - added configdir patch (fixes config file path mismatch)

[qboosh]

commit 047281ad619d5becd7cc30a958e5b114293ffdd4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Feb 12 18:13:15 2013 +0100

    - updated to 1.0.3
    - added configdir patch (fixes config file path mismatch)

 xorg-app-proxymngr-configdir.patch | 11 +++++++++++
 xorg-app-proxymngr.spec            | 16 +++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/xorg-app-proxymngr.spec b/xorg-app-proxymngr.spec
index 6cf62b9..f636539 100644
--- a/xorg-app-proxymngr.spec
+++ b/xorg-app-proxymngr.spec
@@ -1,12 +1,13 @@
 Summary:	proxymngr application - proxy manager service
 Summary(pl.UTF-8):	Aplikacja proxymngr - usługa zarządzająca proxy
 Name:		xorg-app-proxymngr
-Version:	1.0.2
+Version:	1.0.3
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/proxymngr-%{version}.tar.bz2
-# Source0-md5:	714c4656e749ce856690b872e3d4ac4c
+# Source0-md5:	b0dad55abda277f919f6213751badb04
+Patch0:		%{name}-configdir.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -14,6 +15,7 @@ BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	xorg-lib-xtrans-devel
+BuildRequires:	xorg-proto-xproto-devel >= 7.0.17
 BuildRequires:	xorg-proto-xproxymanagementprotocol-devel
 BuildRequires:	xorg-util-util-macros >= 1.8
 Requires:	xorg-app-lbxproxy
@@ -33,6 +35,7 @@ stara się w miarę możliwości wykorzystywać ponownie istniejące proxy.
 
 %prep
 %setup -q -n proxymngr-%{version}
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -42,18 +45,13 @@ stara się w miarę możliwości wykorzystywać ponownie istniejące proxy.
 %configure \
 	LBXPROXY=%{_bindir}/lbxproxy
 
-# NOTE different CONFIG_DIR values - there is a bug in proxymngr 1.0.[12] Makefile.am
-# ("$(CONFIG_DIR)/proxymngr/pmconfig" is appended during build, but pm config is
-# installed in $(CONFIG_DIR) at install stage)
-%{__make} \
-	CONFIG_DIR=/etc/X11
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	CONFIG_DIR=/etc/X11/proxymngr
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/xorg-app-proxymngr-configdir.patch b/xorg-app-proxymngr-configdir.patch
new file mode 100644
index 0000000..412146b
--- /dev/null
+++ b/xorg-app-proxymngr-configdir.patch
@@ -0,0 +1,11 @@
+--- proxymngr-1.0.3/Makefile.am.orig	2013-02-11 02:21:47.000000000 +0100
++++ proxymngr-1.0.3/Makefile.am	2013-02-12 18:08:10.786166637 +0100
+@@ -28,7 +28,7 @@
+ 	$(PROXYMNGR_CFLAGS)				\
+ 	-DXVENDORNAME=\"The\ X\.Org\ Foundation\"	\
+ 	-DXORG_RELEASE=\"Release\ $(VERSION)\"		\
+-	-DCONFIG_FILE=\"$(CONFIG_DIR)/proxymngr/pmconfig\"
++	-DCONFIG_FILE=\"$(CONFIG_DIR)/pmconfig\"
+ 
+ proxymngr_LDADD = $(PROXYMNGR_LIBS)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-proxymngr.git/commitdiff/047281ad619d5becd7cc30a958e5b114293ffdd4