rpms/xpa/devel xpa-2.1.6-makefile.patch,1.2,1.3 xpa.spec,1.22,1.23

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/xpa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1759

Modified Files:
	xpa-2.1.6-makefile.patch xpa.spec 
Log Message:
* Wed Jul 15 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.1.8-7
- Minor changes in the patch


xpa-2.1.6-makefile.patch:

Index: xpa-2.1.6-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/xpa-2.1.6-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xpa-2.1.6-makefile.patch	22 Jun 2006 11:11:34 -0000	1.2
+++ xpa-2.1.6-makefile.patch	16 Jul 2008 15:47:33 -0000	1.3
@@ -14,7 +14,7 @@
  
  # Directory in which to install the include file xpa.h:
 -INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(includedir)/xpa
++INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(includedir)
  
  # Top-level directory for manual entries:
 -MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
@@ -22,7 +22,7 @@
  
  # Top-level directory for share entries:
 -MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
-+MAN_SHARE_DIR =		$(INSTALL_ROOT)$(datadir)/xpa
++MAN_SHARE_DIR =		$(INSTALL_ROOT)$(datadir)
  
  # Platform-specific X compiler flags (include file specifications)
  X_CFLAGS = 		@X_CFLAGS@


Index: xpa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/xpa.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xpa.spec	19 Feb 2008 23:44:12 -0000	1.22
+++ xpa.spec	16 Jul 2008 15:47:33 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name: xpa
 Version: 2.1.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: The XPA messaging system
 
 # Upstream version
@@ -71,7 +71,8 @@
 %{__rm} -rf %{_builddir}/%{name}-%{version}/doc/*.ps
 
 %build
-%configure --enable-shared --with-tcl=%{_libdir} \
+%configure --includedir=%{_includedir}/xpa --datadir=%{_datadir}/xpa \
+	--enable-shared --with-tcl=%{_libdir} \
 	--with-x --enable-threaded-xpans
 %{__make} %{?_smp_mflags}
 %{__make} %{?_smp_mflags} tclxpa
@@ -118,6 +119,9 @@
 %exclude %{_libdir}/*.a
 
 %changelog
+* Wed Jul 15 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.1.8-7
+- Minor changes in the patch
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.8-6
 - Autorebuild for GCC 4.3