From b9dcdc6199278a5bbec76e993e7f082a4730f847 Mon Sep 17 00:00:00 2001 From: Paolo Andreetto Date: Wed, 11 May 2011 10:20:38 +0000 Subject: [PATCH] Fixed doc dir for rpm --- org.glite.wms-utils.exception/Makefile.am | 2 +- org.glite.wms-utils.exception/configure.ac | 5 ++++- .../project/glite-wms-utils-exception_sl5_x86_64.spec | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/org.glite.wms-utils.exception/Makefile.am b/org.glite.wms-utils.exception/Makefile.am index b66c2bb..ee24d57 100755 --- a/org.glite.wms-utils.exception/Makefile.am +++ b/org.glite.wms-utils.exception/Makefile.am @@ -9,7 +9,7 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = LICENSE -docdir = $(datadir)/doc/@PACKAGE@-@VERSION@ +docdir = $(datadir)/doc/@PACKAGE@-@PVER@ doc_DATA = LICENSE ## Subdirectories list SUBDIRS = interface src diff --git a/org.glite.wms-utils.exception/configure.ac b/org.glite.wms-utils.exception/configure.ac index 47ddd5d..b03cc90 100755 --- a/org.glite.wms-utils.exception/configure.ac +++ b/org.glite.wms-utils.exception/configure.ac @@ -19,6 +19,9 @@ # # Revision history: # $Log$ +# Revision 1.13.2.3.2.3 2011/03/08 15:32:29 pandreet +# Removed with-glite-location +# # Revision 1.13.2.3.2.2 2011/03/04 09:39:40 pandreet # Incremented version number # @@ -79,7 +82,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([GLite WMS Utils Exception], [3.2.2]) +AC_INIT([GLite WMS Utils Exception], [3.3.0]) AC_CONFIG_AUX_DIR([./project]) AM_INIT_AUTOMAKE([1.6.3 subdir-objects]) AC_CONFIG_SRCDIR([src/Exception.cpp]) diff --git a/org.glite.wms-utils.exception/project/glite-wms-utils-exception_sl5_x86_64.spec b/org.glite.wms-utils.exception/project/glite-wms-utils-exception_sl5_x86_64.spec index 5e59013..42843f3 100644 --- a/org.glite.wms-utils.exception/project/glite-wms-utils-exception_sl5_x86_64.spec +++ b/org.glite.wms-utils.exception/project/glite-wms-utils-exception_sl5_x86_64.spec @@ -25,7 +25,7 @@ mkdir -p %{buildroot} %build %{!?extbuilddir:%define extbuilddir "--"} if test "x%{extbuilddir}" == "x--" ; then - ./configure --prefix=%{buildroot}/usr --disable-static + ./configure --prefix=%{buildroot}/usr --disable-static PVER=%{version} make fi @@ -50,8 +50,8 @@ rm %{buildroot}/usr/lib64/*.la %files %defattr(-,root,root) -%dir /usr/share/doc/glite-wms-utils-exception-3.2.2/ -/usr/share/doc/glite-wms-utils-exception-3.2.2/LICENSE +%dir /usr/share/doc/glite-wms-utils-exception-%{version}/ +/usr/share/doc/glite-wms-utils-exception-%{version}/LICENSE /usr/lib64/libglite_wmsutils_exception.so.0 /usr/lib64/libglite_wmsutils_exception.so.0.0.0 -- 1.8.2.3