[routino] - Rebase makefiles patch and fix 2 new makefile errors
Kevin Kofler
kkofler at fedoraproject.org
Sat Oct 15 01:14:25 UTC 2011
commit cbf6f1064639d23ef50498ecde07e9ac424f4612
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Oct 15 03:14:16 2011 +0200
- Rebase makefiles patch and fix 2 new makefile errors
...-makefiles.patch => routino-2.1-makefiles.patch | 59 +++++++++++++-------
routino.spec | 1 +
2 files changed, 39 insertions(+), 21 deletions(-)
---
diff --git a/routino-2.0.2-makefiles.patch b/routino-2.1-makefiles.patch
similarity index 68%
rename from routino-2.0.2-makefiles.patch
rename to routino-2.1-makefiles.patch
index dd51b03..47f7c89 100644
--- a/routino-2.0.2-makefiles.patch
+++ b/routino-2.1-makefiles.patch
@@ -1,6 +1,6 @@
-diff -ur routino-2.0.2/doc/Makefile routino-2.0.2-makefiles/doc/Makefile
---- routino-2.0.2/doc/Makefile 2011-05-17 18:45:09.000000000 +0200
-+++ routino-2.0.2-makefiles/doc/Makefile 2011-07-11 09:32:48.000000000 +0200
+diff -ur routino-2.1/doc/Makefile routino-2.1-makefiles/doc/Makefile
+--- routino-2.1/doc/Makefile 2011-05-17 18:45:09.000000000 +0200
++++ routino-2.1-makefiles/doc/Makefile 2011-10-15 03:05:20.000000000 +0200
@@ -24,9 +24,9 @@
# Files to install
@@ -50,9 +50,9 @@ diff -ur routino-2.0.2/doc/Makefile routino-2.0.2-makefiles/doc/Makefile
done
########
-diff -ur routino-2.0.2/Makefile routino-2.0.2-makefiles/Makefile
---- routino-2.0.2/Makefile 2010-12-29 11:46:45.000000000 +0100
-+++ routino-2.0.2-makefiles/Makefile 2011-07-11 09:32:48.000000000 +0200
+diff -ur routino-2.1/Makefile routino-2.1-makefiles/Makefile
+--- routino-2.1/Makefile 2010-12-29 11:46:45.000000000 +0100
++++ routino-2.1-makefiles/Makefile 2011-10-15 03:05:20.000000000 +0200
@@ -22,9 +22,9 @@
# Installation locations
@@ -65,9 +65,9 @@ diff -ur routino-2.0.2/Makefile routino-2.0.2-makefiles/Makefile
datadir=$(prefix)/share/routino
# Sub-directories and sub-makefiles
-diff -ur routino-2.0.2/src/Makefile routino-2.0.2-makefiles/src/Makefile
---- routino-2.0.2/src/Makefile 2011-06-25 21:15:17.000000000 +0200
-+++ routino-2.0.2-makefiles/src/Makefile 2011-07-11 09:33:42.000000000 +0200
+diff -ur routino-2.1/src/Makefile routino-2.1-makefiles/src/Makefile
+--- routino-2.1/src/Makefile 2011-10-03 11:53:45.000000000 +0200
++++ routino-2.1-makefiles/src/Makefile 2011-10-15 03:05:20.000000000 +0200
@@ -31,18 +31,8 @@
# Compilation program options
@@ -121,9 +121,9 @@ diff -ur routino-2.0.2/src/Makefile routino-2.0.2-makefiles/src/Makefile
done
########
-diff -ur routino-2.0.2/src/xml/Makefile routino-2.0.2-makefiles/src/xml/Makefile
---- routino-2.0.2/src/xml/Makefile 2011-01-29 20:43:06.000000000 +0100
-+++ routino-2.0.2-makefiles/src/xml/Makefile 2011-07-11 09:32:48.000000000 +0200
+diff -ur routino-2.1/src/xml/Makefile routino-2.1-makefiles/src/xml/Makefile
+--- routino-2.1/src/xml/Makefile 2011-01-29 20:43:06.000000000 +0100
++++ routino-2.1-makefiles/src/xml/Makefile 2011-10-15 03:05:20.000000000 +0200
@@ -25,8 +25,8 @@
# Program options
@@ -135,28 +135,45 @@ diff -ur routino-2.0.2/src/xml/Makefile routino-2.0.2-makefiles/src/xml/Makefile
# Required to use stdio with files > 2GiB on 32-bit system.
-diff -ur routino-2.0.2/xml/Makefile routino-2.0.2-makefiles/xml/Makefile
---- routino-2.0.2/xml/Makefile 2011-02-23 19:46:44.000000000 +0100
-+++ routino-2.0.2-makefiles/xml/Makefile 2011-07-11 09:32:48.000000000 +0200
-@@ -35,8 +35,8 @@
+diff -ur routino-2.1/xml/Makefile routino-2.1-makefiles/xml/Makefile
+--- routino-2.1/xml/Makefile 2011-09-05 20:12:00.000000000 +0200
++++ routino-2.1-makefiles/xml/Makefile 2011-10-15 03:12:33.000000000 +0200
+@@ -39,14 +39,15 @@
-@[ -d $(WEBDATADIR) ] && \
- for file in $(FILES); do \
+ 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 ;\
+ echo cp -pf routino-$$file $(WEBDATADIR)/$$file ;\
+ cp -pf routino-$$file $(WEBDATADIR)/$$file ;\
fi ;\
- done ;\
- if [ ! -f $(WEBWWWDIR)/profiles.js ] || [ ! -f $(WEBWWWDIR)/profiles.pl ] || \
-@@ -52,8 +52,8 @@
+ done
+- - at for file in $(SPECIAL_FILES); do \
++ -@[ -d $(WEBDATADIR) ] && \
++ for file in $(SPECIAL_FILES); do \
+ if [ ! -f $(WEBDATADIR)/$$file ] || [ $$file -nt $(WEBDATADIR)/$$file ]; then \
+- echo cp $$file $(WEBDATADIR)/$$file ;\
+- cp -f $$file $(WEBDATADIR)/$$file ;\
++ echo cp -pf $$file $(WEBDATADIR)/$$file ;\
++ cp -pf $$file $(WEBDATADIR)/$$file ;\
+ fi ;\
+ done
+ - at if [ ! -f $(WEBWWWDIR)/profiles.js ] || [ ! -f $(WEBWWWDIR)/profiles.pl ] || \
+@@ -72,9 +73,14 @@
+ install: all
-[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir)
@[ -d $(DESTDIR)$(datadir) ] && \
- for file in $(FILES); do \
+- for file in $(STANDARD_FILES) $(SPECIAL_FILES); do \
- echo cp routino-$$file $(DESTDIR)$(datadir)/$$file ;\
- cp -f routino-$$file $(DESTDIR)$(datadir)/$$file ;\
++ for file in $(STANDARD_FILES); do \
+ echo cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\
+ cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\
++ done
++ @[ -d $(DESTDIR)$(datadir) ] && \
++ for file in $(SPECIAL_FILES); do \
++ echo cp -pf $$file $(DESTDIR)$(datadir)/$$file ;\
++ cp -pf $$file $(DESTDIR)$(datadir)/$$file ;\
done
########
diff --git a/routino.spec b/routino.spec
index ddc4ade..493df44 100644
--- a/routino.spec
+++ b/routino.spec
@@ -52,6 +52,7 @@ rm -rf %{buildroot}
* Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-1
- Update to 2.1 (#742903)
- README-MARBLE.txt: update: data files from 2.0(.x) versions no longer work
+- Rebase makefiles patch and fix 2 new makefile errors
* Fri Aug 05 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.3-1
- Update to 2.0.3 (#728490, bugfix release)
More information about the scm-commits
mailing list