SPECS: xorg-app-proxymngr.spec - pass proper CONFIG_DIR values to ...

[qboosh]

Author: qboosh                       Date: Sun Oct 15 11:54:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pass proper CONFIG_DIR values to store pmconfig in /etc/X11/* (following X11-PLD.patch)
- use individual dir, more verbose files, release 1

---- Files affected:
SPECS:
   xorg-app-proxymngr.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/xorg-app-proxymngr.spec
diff -u SPECS/xorg-app-proxymngr.spec:1.9 SPECS/xorg-app-proxymngr.spec:1.10
--- SPECS/xorg-app-proxymngr.spec:1.9	Tue Jan 10 16:03:44 2006
+++ SPECS/xorg-app-proxymngr.spec	Sun Oct 15 13:53:56 2006
@@ -3,16 +3,18 @@
 Summary(pl):	Aplikacja proxymngr
 Name:		xorg-app-proxymngr
 Version:	1.0.1
-Release:	0.1
+Release:	1
 License:	MIT
 Group:		X11/Applications
-Source0:	http://xorg.freedesktop.org/releases/X11R7.0/src/app/proxymngr-%{version}.tar.bz2
+Source0:	http://xorg.freedesktop.org/releases/individual/app/proxymngr-%{version}.tar.bz2
 # Source0-md5:	aad44d0f65b97fd6d564b1d2ae510bb1
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	pkgconfig >= 1:0.19
+BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xorg-lib-xtrans-devel
 BuildRequires:	xorg-proto-xproxymanagementprotocol-devel
 BuildRequires:	xorg-util-util-macros >= 0.99.2
 Requires:	xorg-app-lbxproxy
@@ -35,13 +37,18 @@
 %configure \
 	LBXPROXY=%{_bindir}/lbxproxy
 
-%{__make}
+# NOTE different CONFIG_DIR values - there is a bug in proxymngr 1.0.1 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
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	CONFIG_DIR=/etc/X11/proxymngr
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,9 +56,10 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog
-%attr(755,root,root) %{_bindir}/*
-%{_libdir}/X11/proxymngr
-%{_mandir}/man1/*.1x*
+%attr(755,root,root) %{_bindir}/proxymngr
+%dir /etc/X11/proxymngr
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/proxymngr/pmconfig
+%{_mandir}/man1/proxymngr.1x*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -59,6 +67,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/10/15 11:53:56  qboosh
+- pass proper CONFIG_DIR values to store pmconfig in /etc/X11/* (following X11-PLD.patch)
+- use individual dir, more verbose files, release 1
+
 Revision 1.9  2006/01/10 15:03:44  qboosh
 - 1.0.1 (X11R7.0 release)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.9&r2=1.10&f=u