[davix] - Release 0.2.6 of davix

[Devresse]

commit ae00cd5b10496279fe6acba9553abff426ac7802
Author: Adrien Devresse <Adrien.Devresse at cern.ch>
Date:   Tue Sep 3 15:30:17 2013 +0200

    - Release 0.2.6 of davix

 .gitignore |    1 +
 davix.spec |   61 ++++++++++++++++++++++++++++++++++++++++++-----------------
 sources    |    2 +-
 3 files changed, 45 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a23a99b..f60637c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /davix-0.2.2.tar.gz
+/davix-0.2.6.tar.gz
diff --git a/davix.spec b/davix.spec
index a4f2a6c..8823b8c 100644
--- a/davix.spec
+++ b/davix.spec
@@ -1,6 +1,10 @@
+# unversionned doc dir F20 change https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
+
 Name:				davix
-Version:			0.2.2
-Release:			3%{?dist}
+Version:			0.2.6
+Release:			1%{?dist}
 Summary:			Toolkit for Http-based file management
 Group:				Applications/Internet
 License:			LGPLv2+
@@ -10,10 +14,20 @@ Source0:			http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/%{
 BuildRoot:			%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 #main lib dependencies
-BuildRequires:		cmake
-BuildRequires:		doxygen
-BuildRequires:		libxml2-devel
-BuildRequires:		openssl-devel
+BuildRequires:                  cmake
+BuildRequires:                  doxygen
+BuildRequires:                  libxml2-devel
+BuildRequires:                  openssl-devel
+# davix-copy dependencies
+BuildRequires:                  gridsite-devel
+BuildRequires:                  gsoap-devel
+# unit tests
+BuildRequires:                  gtest-devel
+
+
+Requires:                       %{name}-libs%{?_isa} = %{version}-%{release}
+
+
 
 %description
 Davix is a toolkit designed for file operations
@@ -41,24 +55,32 @@ with Http based protocols (WebDav, Amazon S3, ...).
 
 %package doc
 Summary:			Documentation for %{name}
-Group:				Applications/Internet
-Requires:			%{name}%{?_isa} = %{version}-%{release}
+Group:				Documentation
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch:	noarch
+%endif
 
 %description doc
 Documentation and examples for %{name}. Davix is a toolkit designed 
 for file operations with Http based protocols (WebDav, Amazon S3, ...).
 
 %clean
-rm -rf %{buildroot};
+rm -rf %{buildroot}
 make clean
 
 %prep
 %setup -q
+# remove useless embedded component
+rm -rf test/gtest-1.6.0/
+rm -rf test/pywebdav/
 
 %build
 %cmake \
--DDOC_INSTALL_DIR=%{_docdir}/%{name}-%{version} \
--D UNIT_TESTS=TRUE .
+-DDOC_INSTALL_DIR=%{_pkgdocdir} \
+-DGTEST_EXTERNAL=TRUE \
+-DENABLE_THIRD_PARTY_COPY=TRUE \
+-DUNIT_TESTS=TRUE \
+.
 make %{?_smp_mflags}
 make doc
 
@@ -81,25 +103,28 @@ make DESTDIR=%{buildroot} install
 %files libs
 %defattr (-,root,root)
 %{_libdir}/libdavix.so.*
-%{_docdir}/%{name}-%{version}/RELEASE-NOTES
-%{_docdir}/%{name}-%{version}/LICENSE
+%{_libdir}/libdavix_copy.so.*
+
 
 %files devel
 %defattr (-,root,root)
 %{_libdir}/libdavix.so
+%{_libdir}/libdavix_copy.so
 %dir %{_includedir}/davix
 %{_includedir}/davix/*
 %{_libdir}/pkgconfig/*
 
 %files doc
 %defattr (-,root,root)
-%dir %{_docdir}/%{name}-%{version}/
-%dir %{_docdir}/%{name}-%{version}/html/
-%{_docdir}/%{name}-%{version}/html/*
+%{_pkgdocdir}/LICENSE
+%{_pkgdocdir}/RELEASE-NOTES
+%{_pkgdocdir}/html/
+
 
 %changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Tue Sep 03 2013 Adrien Devresse <adevress at cern.ch> - 0.2.6-1
+ - Release 0.2.6 of davix, see RELEASE-NOTES for details
+
 
 * Wed Jun 05 2013 Adrien Devresse <adevress at cern.ch> - 0.2.2-2
  - Initial EPEL release
diff --git a/sources b/sources
index 5c34704..0a71256 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c4bddfce3809508070df6c647a757e2  davix-0.2.2.tar.gz
+680f925b144b5afd6e1d3dc5028f7adc  davix-0.2.6.tar.gz