[grass] Rebase patches against grass-6.4.4.
corsepiu
corsepiu at fedoraproject.org
Sat Aug 9 08:43:03 UTC 2014
commit 7417321c57842b76e8955567fcf907cb6df2a2cf
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Fri Aug 8 19:58:22 2014 +0200
Rebase patches against grass-6.4.4.
- Convert -Werror=format-security into warnings.
- Minor spec cleanup.
grass-pkgconf.patch => 0001-grass-pkgconf.patch | 18 +++-
...b-soname.patch => 0002-grass-shlib-soname.patch | 48 +++++---
0003-grass-docfiles.patch | 28 ++++
grass-6.4.2-docfiles.patch | 15 --
grass-6.4.3-platform_name_encoding.patch | 19 ---
grass-6.4.3-ppc_build_error_diglib.patch | 136 --------------------
grass.spec | 35 +++---
7 files changed, 92 insertions(+), 207 deletions(-)
---
diff --git a/grass-pkgconf.patch b/0001-grass-pkgconf.patch
similarity index 74%
rename from grass-pkgconf.patch
rename to 0001-grass-pkgconf.patch
index bae0b7c..2c2bbfc 100644
--- a/grass-pkgconf.patch
+++ b/0001-grass-pkgconf.patch
@@ -1,5 +1,16 @@
---- grass.pc.in.orig 2008-01-09 11:10:58.000000000 +0200
-+++ grass.pc.in 2008-03-27 17:12:00.000000000 +0200
+From 921238324f7665043d6d6e600d98f86574dba9ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Sun, 3 Aug 2014 03:42:58 +0200
+Subject: [PATCH 1/3] grass-pkgconf
+
+---
+ grass.pc.in | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/grass.pc.in b/grass.pc.in
+index f2ac912..d4f8c92 100644
+--- a/grass.pc.in
++++ b/grass.pc.in
@@ -1,12 +1,13 @@
# Package Information for pkg-config
@@ -20,3 +31,6 @@
+Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient
+Cflags: -I${includedir}/grass
+Requires: xt x11 xproto glproto gdal
+--
+1.9.3
+
diff --git a/grass-shlib-soname.patch b/0002-grass-shlib-soname.patch
similarity index 88%
rename from grass-shlib-soname.patch
rename to 0002-grass-shlib-soname.patch
index 39f29fd..4362863 100644
--- a/grass-shlib-soname.patch
+++ b/0002-grass-shlib-soname.patch
@@ -1,7 +1,19 @@
-diff -up grass-6.4.2/include/Make/Grass.make.in.shlibver grass-6.4.2/include/Make/Grass.make.in
---- grass-6.4.2/include/Make/Grass.make.in.shlibver 2012-03-02 14:56:53.788021081 -0500
-+++ grass-6.4.2/include/Make/Grass.make.in 2012-03-02 15:05:23.355430132 -0500
-@@ -92,102 +92,102 @@ endif
+From a26bde9414c3a9247b80c71c91225cc2ff0c0c2f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Sun, 3 Aug 2014 03:43:38 +0200
+Subject: [PATCH 2/3] grass-shlib-soname
+
+---
+ include/Make/Grass.make.in | 138 +++++++++++++++++++--------------------
+ include/Make/Shlib.make | 11 +++-
+ raster/r.li/r.li.daemon/Makefile | 2 +-
+ 3 files changed, 78 insertions(+), 73 deletions(-)
+
+diff --git a/include/Make/Grass.make.in b/include/Make/Grass.make.in
+index 4693bfb..d10fe30 100644
+--- a/include/Make/Grass.make.in
++++ b/include/Make/Grass.make.in
+@@ -93,102 +93,102 @@ endif
##################### library names #####################################
@@ -85,15 +97,14 @@ diff -up grass-6.4.2/include/Make/Grass.make.in.shlibver grass-6.4.2/include/Mak
-DIG2_LIBNAME = grass_dig2.$(GRASS_VERSION_NUMBER)
-VECTR_LIBNAME = grass_vect.$(GRASS_VERSION_NUMBER)
-TRANS_LIBNAME = grass_trans.$(GRASS_VERSION_NUMBER)
--
--SHAPE_LIBNAME = grass_shape.$(GRASS_VERSION_NUMBER)
--GRAPH_LIBNAME = grass_dgl.$(GRASS_VERSION_NUMBER)
--RTREE_LIBNAME = grass_rtree.$(GRASS_VERSION_NUMBER)
+DIG_LIBNAME = grass_dig
+DIG2_LIBNAME = grass_dig2
+VECTR_LIBNAME = grass_vect
+TRANS_LIBNAME = grass_trans
-+
+
+-SHAPE_LIBNAME = grass_shape.$(GRASS_VERSION_NUMBER)
+-GRAPH_LIBNAME = grass_dgl.$(GRASS_VERSION_NUMBER)
+-RTREE_LIBNAME = grass_rtree.$(GRASS_VERSION_NUMBER)
+SHAPE_LIBNAME = grass_shape
+GRAPH_LIBNAME = grass_dgl
+RTREE_LIBNAME = grass_rtree
@@ -174,9 +185,10 @@ diff -up grass-6.4.2/include/Make/Grass.make.in.shlibver grass-6.4.2/include/Mak
##################### library switches ##################################
-diff -up grass-6.4.2/include/Make/Shlib.make.shlibver grass-6.4.2/include/Make/Shlib.make
---- grass-6.4.2/include/Make/Shlib.make.shlibver 2011-05-03 15:27:17.000000000 -0400
-+++ grass-6.4.2/include/Make/Shlib.make 2012-03-02 14:54:18.852551365 -0500
+diff --git a/include/Make/Shlib.make b/include/Make/Shlib.make
+index 73076e7..2f63404 100644
+--- a/include/Make/Shlib.make
++++ b/include/Make/Shlib.make
@@ -1,6 +1,8 @@
# common dependencies and rules for building shared libraries
@@ -202,9 +214,10 @@ diff -up grass-6.4.2/include/Make/Shlib.make.shlibver grass-6.4.2/include/Make/S
endif
shlib: $(SHLIB)
-diff -up grass-6.4.2/raster/r.li/r.li.daemon/Makefile.shlibver grass-6.4.2/raster/r.li/r.li.daemon/Makefile
---- grass-6.4.2/raster/r.li/r.li.daemon/Makefile.shlibver 2012-03-02 15:02:38.009056327 -0500
-+++ grass-6.4.2/raster/r.li/r.li.daemon/Makefile 2012-03-02 15:02:50.572932790 -0500
+diff --git a/raster/r.li/r.li.daemon/Makefile b/raster/r.li/r.li.daemon/Makefile
+index 6b2bd75..ba4b831 100644
+--- a/raster/r.li/r.li.daemon/Makefile
++++ b/raster/r.li/r.li.daemon/Makefile
@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../../..
EXTRA_LIBS=$(GISLIB) $(MATHLIB)
@@ -212,5 +225,8 @@ diff -up grass-6.4.2/raster/r.li/r.li.daemon/Makefile.shlibver grass-6.4.2/raste
-LIB_NAME = grass_rli.$(GRASS_VERSION_NUMBER)
+LIB_NAME = grass_rli
- LIB_OBJS = daemon.o list.o ipc.o worker.o GenericCell.o avl.o avlID.o
+ LIB_OBJS = daemon.o list.o worker.o GenericCell.o avl.o avlID.o
+--
+1.9.3
+
diff --git a/0003-grass-docfiles.patch b/0003-grass-docfiles.patch
new file mode 100644
index 0000000..b6da1e8
--- /dev/null
+++ b/0003-grass-docfiles.patch
@@ -0,0 +1,28 @@
+From 6863b6979dd30781ff680aee346f164b38788103 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Sun, 3 Aug 2014 03:49:21 +0200
+Subject: [PATCH 3/3] grass-6.4.2-docfiles
+
+---
+ Makefile | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8f860c6..d2db723 100644
+--- a/Makefile
++++ b/Makefile
+@@ -60,10 +60,7 @@ else
+ LOCALE=0
+ endif
+
+-FILES = AUTHORS COPYING CHANGES REQUIREMENTS.html GPL.TXT contributors.csv contributors_extra.csv translators.csv
+-
+-BIN_DIST_FILES = $(FILES) \
+- grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp \
++BIN_DIST_FILES = grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp \
+ bin \
+ bwidget \
+ docs \
+--
+1.9.3
+
diff --git a/grass.spec b/grass.spec
index ae43d44..370cbba 100644
--- a/grass.spec
+++ b/grass.spec
@@ -25,27 +25,19 @@
Name: grass
Version: 6.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GRASS - Geographic Resources Analysis Support System
Group: Applications/Engineering
License: GPLv2+
URL: http://grass.osgeo.org
Source0: http://grass.osgeo.org/%{name}%{shortversion}/source/%{name}-%{version}.tar.gz
Source2: %{name}-config.h
-Patch0: %{name}-pkgconf.patch
+Patch0: 0001-grass-pkgconf.patch
# Warning: This patch contains the GRASS version number
-Patch1: %{name}-shlib-soname.patch
+Patch1: 0002-grass-shlib-soname.patch
-Patch2: %{name}-6.4.2-docfiles.patch
-
-# Distribution name characters can cause a GUI crash
-# http://trac.osgeo.org/grass/changeset/57908
-Patch3: %{name}-6.4.3-platform_name_encoding.patch
-
-# Build failure on PPC (BZ#961838)
-# http://trac.osgeo.org/grass/changeset/57856/grass/branches/releasebranch_6_4/lib/vector
-Patch4: %{name}-6.4.3-ppc_build_error_diglib.patch
+Patch2: 0003-grass-docfiles.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -133,12 +125,9 @@ GRASS (Geographic Resources Analysis Support System) development headers.
%prep
%setup -q
-%patch0 -p0 -b .pkgconf~
-%patch1 -p1 -b .shlibver~
-%patch2 -p1 -b .docfiles~
-%patch3 -p4 -b .release_encoding~
-%patch4 -p3 -b .ppc_diglib~
-find . -type f -name "*~" -delete
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
# Correct mysql_config query
sed -i 's|--libmysqld-libs|--libs|g' configure
@@ -157,6 +146,9 @@ sed -i -e 's|\r||g' gui/icons/%{name}/vdigit/box.xbm
#TODO: Necessary?
export INSTALL="%{__install} -c -p"
+# Package is not ready for -Werror=format-security
+CFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's,-Werror=format-security,-Wformat-security,')" \
+CXXFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's,-Werror=format-security,-Wformat-security,')" \
%configure \
--enable-largefile \
--enable-shared \
@@ -373,7 +365,12 @@ fi
%changelog
-* Fri Jul 25 2014 Peter Robinson <pbrobinson at fedoraproject.org> 6.4.4--1
+* Sat Aug 09 2014 Ralf Corsépius <corsepius at fedoraproject.org> 6.4.4-2
+- Rebase patches against grass-6.4.4.
+- Convert -Werror=format-security into warnings (RHBZ#1106720).
+- Minor spec cleanup.
+
+* Fri Jul 25 2014 Peter Robinson <pbrobinson at fedoraproject.org> 6.4.4-1
- Update to 6.4.4
- Make 64bit conditionals generic
More information about the scm-commits
mailing list