- updated to 2.1-3

- updated FHS patch, adjusted to use pkglibexecdir

diff --git a/CUnit-FHS.patch b/CUnit-FHS.patch
index 903bd3316aaa63c75b3d9f039f9c168b4c5e352c..5d1df41c6abbbe89100ceda9f1e634dfa8e3447c 100644 (file)
--- a/CUnit-FHS.patch
+++ b/CUnit-FHS.patch
@@ -27,7 +27,7 @@
  ## Process this file with automake to produce Makefile.in
  
 -exampledir=${datadir}/@PACKAGE@/Examples/Automated
-+exampledir=$(pkglibdir)/Examples/Automated
++exampledir=$(pkglibexecdir)/Examples/Automated
  
  if ENABLE_EXAMPLES
  if ENABLE_AUTOMATED
@@ -37,7 +37,7 @@
  ## Process this file with automake to produce Makefile.in
  
 -exampledir=${datadir}/@PACKAGE@/Examples/Basic
-+exampledir=$(pkglibdir)/Examples/Basic
++exampledir=$(pkglibexecdir)/Examples/Basic
  
  if ENABLE_EXAMPLES
  if ENABLE_BASIC
@@ -47,7 +47,7 @@
  ## Process this file with automake to produce Makefile.in
  
 -exampledir=${datadir}/@PACKAGE@/Examples/Console
-+exampledir=$(pkglibdir)/Examples/Console
++exampledir=$(pkglibexecdir)/Examples/Console
  
  if ENABLE_EXAMPLES
  if ENABLE_CONSOLE
@@ -57,18 +57,18 @@
  ## Process this file with automake to produce Makefile.in
  
 -exampledir=${datadir}/@PACKAGE@/Examples/Curses
-+exampledir=$(pkglibdir)/Examples/Curses
++exampledir=$(pkglibexecdir)/Examples/Curses
  
  if ENABLE_EXAMPLES
  if ENABLE_CURSES
---- CUnit-2.1-2/CUnit/Sources/Test/Makefile.am.orig    2013-10-15 20:41:40.950750230 +0200
-+++ CUnit-2.1-2/CUnit/Sources/Test/Makefile.am 2013-10-15 20:42:06.947415805 +0200
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
+--- CUnit-2.1-3/CUnit/Sources/Test/Makefile.am.orig    2018-04-14 20:13:35.236957272 +0200
++++ CUnit-2.1-3/CUnit/Sources/Test/Makefile.am 2018-04-14 20:16:47.150288418 +0200
+@@ -2,7 +2,7 @@
  
  if ENABLE_TEST
+ AM_CPPFLAGS = -I$(top_srcdir)/CUnit/Headers
 -testdir=${datadir}/@PACKAGE@/Test
-+testdir=$(pkglibdir)/Test
++testdir=$(pkglibexecdir)/Test
  
  test_PROGRAMS = test_cunit
  test_cunit_SOURCES = test_cunit.c

diff --git a/CUnit.spec b/CUnit.spec
index bd44ba412228bd50f40626d587d772baa3ff6839..1e92eda08022959d9795307df9c01808c50b84f0 100644 (file)
--- a/CUnit.spec
+++ b/CUnit.spec
@@ -7,11 +7,11 @@ Summary:      Automated testing framework for C
 Summary(pl.UTF-8):     Szkielet automatycznych testów dla C
 Name:          CUnit
 Version:       2.1
-Release:       2
+Release:       3
 License:       LGPL v2+
 Group:         Development/Tools
-Source0:       http://downloads.sourceforge.net/cunit/%{name}-%{version}-2-src.tar.bz2
-# Source0-md5: 31c62bd7a65007737ba28b7aafc44d3a
+Source0:       http://downloads.sourceforge.net/cunit/%{name}-%{version}-3.tar.bz2
+# Source0-md5: b5f1a9f6093869c070c6e4a9450cc10c
 Patch0:                %{name}-curses.patch
 Patch1:                %{name}-libs.patch
 Patch2:                %{name}-FHS.patch
@@ -81,7 +81,7 @@ CUnit examples.
 Przykłady do CUnita.
 
 %prep
-%setup -q -n %{name}-%{version}-2
+%setup -q -n %{name}-%{version}-3
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -135,20 +135,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with examples}
 %files examples
-%dir %{_libdir}/CUnit
-%dir %{_libdir}/CUnit/Examples
-%dir %{_libdir}/CUnit/Examples/Automated
-%attr(755,root,root) %{_libdir}/CUnit/Examples/Automated/AutomatedTest
-%{_libdir}/CUnit/Examples/Automated/README
-%dir %{_libdir}/CUnit/Examples/Basic
-%attr(755,root,root) %{_libdir}/CUnit/Examples/Basic/BasicTest
-%{_libdir}/CUnit/Examples/Basic/README
-%dir %{_libdir}/CUnit/Examples/Console
-%attr(755,root,root) %{_libdir}/CUnit/Examples/Console/ConsoleTest
-%{_libdir}/CUnit/Examples/Console/README
-%dir %{_libdir}/CUnit/Examples/Curses
-%attr(755,root,root) %{_libdir}/CUnit/Examples/Curses/CursesTest
-%{_libdir}/CUnit/Examples/Curses/README
-%dir %{_libdir}/CUnit/Test
-%attr(755,root,root) %{_libdir}/CUnit/Test/test_cunit
+%dir %{_libexecdir}/CUnit
+%dir %{_libexecdir}/CUnit/Examples
+%dir %{_libexecdir}/CUnit/Examples/Automated
+%attr(755,root,root) %{_libexecdir}/CUnit/Examples/Automated/AutomatedTest
+%{_libexecdir}/CUnit/Examples/Automated/README
+%dir %{_libexecdir}/CUnit/Examples/Basic
+%attr(755,root,root) %{_libexecdir}/CUnit/Examples/Basic/BasicTest
+%{_libexecdir}/CUnit/Examples/Basic/README
+%dir %{_libexecdir}/CUnit/Examples/Console
+%attr(755,root,root) %{_libexecdir}/CUnit/Examples/Console/ConsoleTest
+%{_libexecdir}/CUnit/Examples/Console/README
+%dir %{_libexecdir}/CUnit/Examples/Curses
+%attr(755,root,root) %{_libexecdir}/CUnit/Examples/Curses/CursesTest
+%{_libexecdir}/CUnit/Examples/Curses/README
+%dir %{_libexecdir}/CUnit/Test
+%attr(755,root,root) %{_libexecdir}/CUnit/Test/test_cunit
 %endif