[dmlite] update for new upstream release

[Ricardo Rocha]

commit 41defb4d911707c59a5b67334127d0ab0d2ffd3e
Author: rochaporto <rocha.porto at gmail.com>
Date:   Thu Jul 19 12:13:05 2012 +0200

    update for new upstream release

 .gitignore                  |    1 +
 dmlite-jni-removal.patch    |   14 ------------
 dmlite-tmp-array.patch      |   47 +++++++++++++++++++++++++++++++++++++++++++
 dmlite-unistd-include.patch |   47 -------------------------------------------
 dmlite.spec                 |   21 +++++++++----------
 sources                     |    2 +-
 6 files changed, 59 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 502d7b1..ca00287 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /dmlite-0.2.0.tar.gz
+/dmlite-0.3.0.tar.gz
diff --git a/dmlite-tmp-array.patch b/dmlite-tmp-array.patch
new file mode 100644
index 0000000..719ca3a
--- /dev/null
+++ b/dmlite-tmp-array.patch
@@ -0,0 +1,47 @@
+Index: plugins/adapter/FilesystemDriver.cpp
+===================================================================
+--- plugins/adapter/FilesystemDriver.cpp  (revision 6763)
++++ plugins/adapter/FilesystemDriver.cpp  (working copy)
+@@ -248,7 +248,8 @@
+     // 4 on overwrite allows to add additional replicas
+     // This way, dmlite can take care of handling the catalog creation in advance
+     // No, this is not documented, done as seen on dpm_replicate.c
+-    dpm_put(1, &reqfile, 1, (char*[]){ (char *)"rfio"}, (char *)"dmlite::adapter::put", 1,
++    char *rfio[] = {"rfio"};
++    dpm_put(1, &reqfile, 1, rfio, (char *)"dmlite::adapter::put", 1,
+             0, token, &nReplies, &statuses);;
+ 
+     wait = statuses[0].status == DPM_QUEUED  ||
+Index: plugins/adapter/DpmAdapter.cpp
+===================================================================
+--- plugins/adapter/DpmAdapter.cpp  (revision 6763)
++++ plugins/adapter/DpmAdapter.cpp  (working copy)
+@@ -88,7 +88,8 @@
+ 
+   try {
+     // Request
+-    RETRY(dpm_get(1, &request, 1, (char*[]){(char *)"rfio"}, (char *)"libdm::dummy::dpm::get", 0,
++    char *rfio[] = {"rfio"};
++    RETRY(dpm_get(1, &request, 1, rfio, (char *)"libdm::dummy::dpm::get", 0,
+                  r_token, &nReplies, &statuses), this->retryLimit_);
+     if (nReplies < 1)
+       throw DmException(DM_NO_REPLICAS, "No replicas found for " + path);
+@@ -176,7 +177,8 @@
+   }
+ 
+   try {
+-    RETRY(dpm_put(1, &reqfile, 1, (char*[]){ (char *)"rfio"}, (char *)"libdm::dummy::dpm::put", 0,
++    char *rfio[] = {"rfio"};
++    RETRY(dpm_put(1, &reqfile, 1, rfio, (char *)"libdm::dummy::dpm::put", 0,
+                   0, token, &nReplies, &statuses), this->retryLimit_);
+ 
+     wait = statuses[0].status == DPM_QUEUED  ||
+Index: tests/test-checkperm.cpp
+===================================================================
+--- tests/test-checkperm.cpp  (revision 6763)
++++ tests/test-checkperm.cpp  (working copy)
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <cppunit/TestFixture.h>
+ #include <cppunit/TestAssert.h>
+ #include <cppunit/ui/text/TestRunner.h>
diff --git a/dmlite.spec b/dmlite.spec
index 235a1fa..eaa14f4 100644
--- a/dmlite.spec
+++ b/dmlite.spec
@@ -1,6 +1,6 @@
 Name:		dmlite
-Version:	0.2.0
-Release:	4%{?dist}
+Version:	0.3.0
+Release:	1%{?dist}
 Summary:	Common libraries for grid data management and storage
 Group:		Applications/Internet
 License:	ASL 2.0
@@ -10,12 +10,9 @@ URL:		https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm/Dev/Dmlite
 # svn export http://svn.cern.ch/guest/lcgdm/dmlite/tags/dmlite_0_3_0 dmlite-0.3.0
 # tar -czvf dmlite-0.3.0.tar.gz dmlite-0.3.0
 Source0:	%{name}-%{version}.tar.gz
-# Remove dependency on JNI cmake module (not required and unavailable)
-# https://svnweb.cern.ch/trac/lcgdm/ticket/538
-Patch0:		dmlite-jni-removal.patch
-# Add missing unistd.h include
-# https://svnweb.cern.ch/trac/lcgdm/ticket/539
-Patch1:		dmlite-unistd-include.patch
+# build fails in fedora rawhide (18) - tmp array issue
+# https://its.cern.ch/jira/browse/LCGDM-620
+Patch0:		dmlite-tmp-array.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake
@@ -103,7 +100,6 @@ Man pages and HTML documentation for dmlite.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p0
-%patch1 -p0
 
 %build
 %cmake . -DCMAKE_INSTALL_PREFIX=/
@@ -127,14 +123,14 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/dmlite.conf
 %{_libdir}/libdmlite.so.*
-%{_libdir}/libdmlitecommon.so.*
+%{_libdir}/libdmliteutils.so.*
 %doc README LICENSE
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/dmlite
 %{_libdir}/libdmlite.so
-%{_libdir}/libdmlitecommon.so
+%{_libdir}/libdmliteutils.so
 
 %files plugins-adapter
 %defattr(-,root,root,-)
@@ -162,6 +158,9 @@ rm -rf %{buildroot}
 %{_defaultdocdir}/%{name}-%{version}
 
 %changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-1
+- Update for new upstream release
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index c4e1401..f80d759 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b8e3688d47a45234bd744a2efc925d0  dmlite-0.2.0.tar.gz
+84793a8135b9291f704612683d9adaa0  dmlite-0.3.0.tar.gz