[lcgdm-dav/f18] Update for new upstream release

Alejandro Alvarez aalvarez at fedoraproject.org
Fri Jul 12 07:54:46 UTC 2013


commit 3c78412474064eb7b84f22146de7787437c6eacc
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Jul 12 09:54:28 2013 +0200

    Update for new upstream release

 .gitignore               |    1 +
 lcgdm-dav-disk-log.patch |   20 ++++++++++++++++++++
 lcgdm-dav.spec           |   18 ++++++++++--------
 sources                  |    3 +--
 4 files changed, 32 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7bb80bb..106704c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /lcgdm-dav-0.12.1.tar.gz
 /LCGDM-990.patch
 /lcgdm-dav-unescape.patch
+/lcgdm-dav-0.12.2.tar.gz
diff --git a/lcgdm-dav-disk-log.patch b/lcgdm-dav-disk-log.patch
new file mode 100644
index 0000000..7e316c0
--- /dev/null
+++ b/lcgdm-dav-disk-log.patch
@@ -0,0 +1,20 @@
+Index: src/mod_lcgdm_disk/repository.c
+===================================================================
+--- src/mod_lcgdm_disk/repository.c	(revision 9203)
++++ src/mod_lcgdm_disk/repository.c	(working copy)
+@@ -235,12 +235,12 @@
+   if ((*resource)->exists)
+     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                   "Resource for %s (%s) found (dir=%d)",
+-                  (*resource)->uri, (*resource)->info->loc.chunks[0].url.query,
++                  (*resource)->uri, (*resource)->info->loc.chunks[0].url.path,
+                   (*resource)->collection);
+   else
+     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                   "NULL resource for %s (%s) created",
+-                  (*resource)->uri, (*resource)->info->loc.chunks[0].url.query);
++                  (*resource)->uri, (*resource)->info->loc.chunks[0].url.path);
+ 
+   return NULL;
+ }
+
diff --git a/lcgdm-dav.spec b/lcgdm-dav.spec
index 0bb2f78..0379503 100644
--- a/lcgdm-dav.spec
+++ b/lcgdm-dav.spec
@@ -1,21 +1,19 @@
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}} 
 
 Name:		lcgdm-dav
-Version:	0.12.1
-Release:	2%{?dist}
+Version:	0.12.2
+Release:	1%{?dist}
 Summary:	HTTP/DAV front end to the DPM/LFC services
 Group:		Applications/Internet
 License:	ASL 2.0
 URL:		https://svnweb.cern.ch/trac/lcgdm
 # The source of this package was pulled from upstream's vcs. Use the
 # following commands to generate the tarball:
-# svn export http://svn.cern.ch/guest/lcgdm/lcgdm-dav/tags/lcgdm-dav_0_12_1 lcgdm-dav-0.12.1
-# tar -czvf lcgdm-dav-0.12.1.tar.gz lcgdm-dav-0.12.1
+# svn export http://svn.cern.ch/guest/lcgdm/lcgdm-dav/tags/lcgdm-dav_0_12_2 lcgdm-dav-0.12.2
+# tar -czvf lcgdm-dav-0.12.2.tar.gz lcgdm-dav-0.12.2
 Source0:	%{name}-%{version}.tar.gz
-#		mod_lcgdm_disk url-decodes received parameters
-#		https://its.cern.ch/jira/browse/LCGDM-990
-Patch0:		lcgdm-dav-unescape.patch
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0:		lcgdm-dav-disk-log.patch
 
 BuildRequires:	cmake%{?_isa}
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
@@ -82,6 +80,7 @@ The lcgdm-dav server package providing the HTTP and DAV front end to the LCGDM
 
 %prep
 %setup -q -n %{name}-%{version}
+
 %patch0 -p0
 
 %build
@@ -127,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/*
 
 %changelog
+* Thu Jul 11 2013 Alejandro Alvarez <aalvarez at cern.ch> - 0.12.2-1
+- Update for new upstream release
+
 * Tue Mar 05 2013 Alejandro Alvarez <aalvarez at cern.ch> - 0.12.1-2
 - Upstream patch: mod_lcgdm_disk url-decodes received parameters
 
diff --git a/sources b/sources
index 89777c2..93bbff4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-0b6968c0359d37871614e38c0352ba5b  lcgdm-dav-0.12.1.tar.gz
-0b4bffeb44c1cbc6d1c1fdb2ebb949de  lcgdm-dav-unescape.patch
+ea689240646285ebbb5e8243d92c5e70  lcgdm-dav-0.12.2.tar.gz


More information about the scm-commits mailing list