- rediff patches, fix files, rebuild with openssl 3.0.0, rel 4

diff --git a/grass-ctypesgen.patch b/grass-ctypesgen.patch
index 45832f5f12ded3c351ed856b8df406336f636605..d87d6e38165e501a904f21375ee53f3aa3303a20 100644 (file)
--- a/grass-ctypesgen.patch
+++ b/grass-ctypesgen.patch
@@ -1,7 +1,8 @@
---- grass-6.4.5/lib/python/ctypes/ctypesgencore/parser/cgrammar.py.orig        2016-04-02 20:36:44.203067400 +0200
-+++ grass-6.4.5/lib/python/ctypes/ctypesgencore/parser/cgrammar.py     2016-04-02 09:42:23.508048350 +0200
-@@ -1080,7 +1080,7 @@
-         p[0] = p[1]
+diff -urNp -x '*.orig' grass-7.6.1.org/lib/python/ctypes/ctypesgencore/parser/cgrammar.py grass-7.6.1/lib/python/ctypes/ctypesgencore/parser/cgrammar.py
+--- grass-7.6.1.org/lib/python/ctypes/ctypesgencore/parser/cgrammar.py 2019-03-19 21:05:06.000000000 +0100
++++ grass-7.6.1/lib/python/ctypes/ctypesgencore/parser/cgrammar.py     2021-10-06 23:39:56.737556037 +0200
+@@ -1182,7 +1182,7 @@ def p_macro_parameter_list(p):
+ 
  
  def p_error(t):
 -    if t.lexer.in_define:

diff --git a/grass-soname.patch b/grass-soname.patch
index 825fb82895ac1c817dd23654c42fcd9003c527ff..09b2e087b215ac5be632f8fd8577ad83d3c20ede 100644 (file)
--- a/grass-soname.patch
+++ b/grass-soname.patch
@@ -1,11 +1,12 @@
---- grass-7.0.3/include/Make/Shlib.make.orig   2016-04-03 10:07:58.271024747 +0200
-+++ grass-7.0.3/include/Make/Shlib.make        2016-04-03 10:27:41.467641758 +0200
-@@ -7,7 +7,7 @@
+diff -urNp -x '*.orig' grass-7.6.1.org/include/Make/Shlib.make grass-7.6.1/include/Make/Shlib.make
+--- grass-7.6.1.org/include/Make/Shlib.make    2019-03-19 20:56:58.000000000 +0100
++++ grass-7.6.1/include/Make/Shlib.make        2021-10-06 23:39:55.040895522 +0200
+@@ -7,7 +7,7 @@ CXXFLAGS += $(SHLIB_CFLAGS)
  LDFLAGS += $(SHLIB_LDFLAGS)
  
  $(SHLIB): $(SHLIB_OBJS)
 -      $(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
 +      $(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
  ifndef MINGW
-       (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
+       (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_LIB_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
  endif

diff --git a/grass.spec b/grass.spec
index e91723f9999cd725b312ca7663f27256331b906d..120ce7bab45ea0f695ab451c3da187d089bbdaa3 100644 (file)
--- a/grass.spec
+++ b/grass.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8):    System obsługujący analizę zasobów geograficznych
 Name:          grass
 Version:       7.6.1
 %define                gver    %(echo %{version} | awk -F. '{ print $1$2 }')
-Release:       3
+Release:       4
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
@@ -230,10 +230,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGES CITING COPYING README TODO
-#%attr(755,root,root) %{_bindir}/grass%{gver}
+%attr(755,root,root) %{_bindir}/grass%{gver}
 %attr(755,root,root) %{_libdir}/libgrass_*.*.*.so
 %dir %{_libdir}/grass%{gver}
-%dir %{_libdir}/grass%{gver}/*.csv
+%{_libdir}/grass%{gver}/*.csv
 %attr(755,root,root) %{_libdir}/grass%{gver}/config.status
 %attr(755,root,root) %{_libdir}/grass%{gver}/bin
 %attr(755,root,root) %{_libdir}/grass%{gver}/driver