diff --git a/add_makefiles.patch b/add_makefiles.patch index 4103429..22ea0be 100644 --- a/add_makefiles.patch +++ b/add_makefiles.patch @@ -1,7 +1,7 @@ diff -Nurp shunit2-2.1.6.orig/doc/Makefile shunit2-2.1.6/doc/Makefile --- shunit2-2.1.6.orig/doc/Makefile 1970-01-01 08:00:00.000000000 +0800 +++ shunit2-2.1.6/doc/Makefile 2011-05-04 11:19:48.149344760 +0800 -@@ -0,0 +1,33 @@ +@@ -0,0 +1,31 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Name: Makefile @@ -21,16 +21,14 @@ diff -Nurp shunit2-2.1.6.orig/doc/Makefile shunit2-2.1.6/doc/Makefile + shunit2.txt\ + TODO.txt + -+DOCDIR=/usr/share/doc/$(PKGNAME)-$(PKGVERSION) -+ +.PHONY: clean + +build: + @echo "Nothing to build" + +install: $(FILES) -+ mkdir -p $(DESTDIR)$(DOCDIR) -+ install -p -m 644 $(FILES) $(DESTDIR)$(DOCDIR)/ ++ mkdir -p $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION) ++ install -p -m 644 $(FILES) $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/ + +clean: + rm -f *.tar.gz *.tgz @@ -38,7 +36,7 @@ diff -Nurp shunit2-2.1.6.orig/doc/Makefile shunit2-2.1.6/doc/Makefile diff -Nurp shunit2-2.1.6.orig/examples/Makefile shunit2-2.1.6/examples/Makefile --- shunit2-2.1.6.orig/examples/Makefile 1970-01-01 08:00:00.000000000 +0800 +++ shunit2-2.1.6/examples/Makefile 2011-05-04 11:19:48.149344760 +0800 -@@ -0,0 +1,30 @@ +@@ -0,0 +1,28 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Name: Makefile @@ -55,16 +53,14 @@ diff -Nurp shunit2-2.1.6.orig/examples/Makefile shunit2-2.1.6/examples/Makefile + math.inc\ + mkdir_test.sh + -+DOCDIR=/usr/share/doc/$(PKGNAME)-$(PKGVERSION) -+ +.PHONY: clean + +build: + @echo "Nothing to build" + +install: $(FILES) -+ mkdir -p $(DESTDIR)$(DOCDIR)/examples -+ install -p -m 644 $(FILES) $(DESTDIR)$(DOCDIR)/examples/ ++ mkdir -p $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples ++ install -p -m 644 $(FILES) $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/ + +clean: + rm -f *.tar.gz *.tgz diff --git a/shunit2.spec b/shunit2.spec index fac3fb2..74607cc 100644 --- a/shunit2.spec +++ b/shunit2.spec @@ -1,22 +1,19 @@ -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - Name: shunit2 Version: 2.1.6 -Release: 32%{?dist} +Release: 3%{?dist} Summary: A xUnit based unit testing for Unix shell scripts -# Automatically converted from old format: LGPLv2 - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2 +Group: Development/Languages +License: LGPLv2 URL: http://code.google.com/p/shunit2 Source0: http://shunit2.googlecode.com/files/%{name}-%{version}.tgz # add makefiles to do install Source1: LGPL-2.1 Patch0: add_makefiles.patch Patch1: fix_examples_source_path.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: make - %description shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and it is designed to work in a similar manner to JUnit, PyUnit, etc. @@ -25,8 +22,8 @@ shUnit2 can do the job. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 +%patch0 -p1 +%patch1 -p1 iconv -f ISO88592 -t UTF8 doc/shunit2.txt -o doc/shunit2.txt cp -p %{SOURCE1} doc/ @@ -37,109 +34,27 @@ cp -p %{SOURCE1} doc/ %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} DOCDIR=%{_pkgdocdir} +make install DESTDIR=%{buildroot} +%clean +rm -rf %{buildroot} + %files +%defattr(-,root,root,-) %dir %{_datadir}/%{name} %{_datadir}/%{name}/* -%{_pkgdocdir} +%doc %{_docdir}/%{name}-%{version} + %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 2.1.6-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 2.1.6-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 2.1.6-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 2.1.6-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 04 2024 Miroslav Suchý - 2.1.6-28 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 2.1.6-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 2.1.6-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.1.6-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.1.6-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.1.6-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.1.6-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.1.6-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 2.1.6-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.1.6-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 2.1.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 2.1.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 2.1.6-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.1.6-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Igor Gnatenko - 2.1.6-14 -- Escape macros in %%changelog - -* Thu Jul 27 2017 Fedora Release Engineering - 2.1.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.1.6-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 2.1.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.1.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.1.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Dec 14 2013 Ville Skyttä - 2.1.6-8 -- Install docs to %%{_pkgdocdir} where available (#994092). - -* Sun Aug 04 2013 Fedora Release Engineering - 2.1.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 2.1.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 2.1.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - * Tue May 17 2011 Hushan Jia 2.1.6-3 - fix file list warning * Tue May 17 2011 Hushan Jia 2.1.6-2 -- remove duplicate %%doc directive +- remove duplicate %doc directive - fix source include path of examples - replace license with update-to-date version