[routino] * Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-2 - makefiles patch: add one more ch

[Kevin Kofler]

commit d09e1cbc30f646f0cb02f4aef92403f267f5cca5
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Oct 27 17:47:25 2011 +0200

    * Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-2
    - makefiles patch: add one more check for WEBDATADIR existence

 routino-2.1.1-makefiles.patch |   12 ++++++++----
 routino.spec                  |    5 ++++-
 2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/routino-2.1.1-makefiles.patch b/routino-2.1.1-makefiles.patch
index 4be5551..e39b47f 100644
--- a/routino-2.1.1-makefiles.patch
+++ b/routino-2.1.1-makefiles.patch
@@ -137,10 +137,14 @@ diff -ur routino-2.1.1/src/xml/Makefile routino-2.1.1-makefiles/src/xml/Makefile
  
 diff -ur routino-2.1.1/xml/Makefile routino-2.1.1-makefiles/xml/Makefile
 --- routino-2.1.1/xml/Makefile	2011-10-16 19:44:56.000000000 +0200
-+++ routino-2.1.1-makefiles/xml/Makefile	2011-10-27 17:14:00.000000000 +0200
-@@ -38,17 +38,19 @@
++++ routino-2.1.1-makefiles/xml/Makefile	2011-10-27 17:42:41.000000000 +0200
+@@ -36,19 +36,22 @@
+ ########
+ 
  all: $(SPECIAL_FILES)
- 	- at for file in $(STANDARD_FILES); do \
+-	- at for file in $(STANDARD_FILES); do \
++	-@[ -d $(WEBDATADIR) ] && \
++          for file in $(STANDARD_FILES); do \
  	     if [ ! -f $(WEBDATADIR)/$$file ] || [ routino-$$file -nt $(WEBDATADIR)/$$file ]; then \
 -	        echo cp routino-$$file $(WEBDATADIR)/$$file ;\
 -	        cp -f routino-$$file $(WEBDATADIR)/$$file ;\
@@ -164,7 +168,7 @@ diff -ur routino-2.1.1/xml/Makefile routino-2.1.1-makefiles/xml/Makefile
  	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.pl ] || \
  	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.js ]; then \
  	     echo perl update-profiles.pl ;\
-@@ -75,12 +77,12 @@
+@@ -75,12 +78,12 @@
  install: all
  	-[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir)
  	- at for file in $(STANDARD_FILES) ; do \
diff --git a/routino.spec b/routino.spec
index eab6182..ffba2f4 100644
--- a/routino.spec
+++ b/routino.spec
@@ -1,7 +1,7 @@
 Name: routino
 Summary: Router for OpenStreetMap Data
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: AGPLv3+
 Group: Applications/Productivity
 URL: http://www.routino.org/
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-2
+- makefiles patch: add one more check for WEBDATADIR existence
+
 * Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-1
 - Update to 2.1.1 (#748392, bugfix release)
 - README-MARBLE.txt: update version number reference (2.1 → 2.1.x)