diff --git a/.gitignore b/.gitignore index c2678d3..1adb93b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ /admesh-0.98.2.tar.gz /admesh-0.98.3.tar.gz /admesh-0.98.4.tar.gz -/admesh-0.98.5.tar.gz diff --git a/admesh.spec b/admesh.spec index 6f6f0dd..7ff8089 100644 --- a/admesh.spec +++ b/admesh.spec @@ -1,20 +1,13 @@ Name: admesh -Version: 0.98.5 -Release: %autorelease +Version: 0.98.4 +Release: 2%{?dist} Summary: Diagnose and/or repair problems with STereo Lithography files -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: http://github.com/admesh/admesh/ -Source: http://github.com/admesh/admesh/releases/download/v%{version}/admesh-%{version}.tar.gz +Source0: http://github.com/admesh/admesh/releases/download/v%{version}/admesh-%{version}.tar.gz BuildRequires: gcc -BuildRequires: make Requires: %{name}-libs%{?_isa} = %{version}-%{release} -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11 -ExcludeArch: %{ix86} -%endif - %description ADMesh is a program for diagnosing and/or repairing commonly encountered problems with STL (STereo Lithography) data files. It can remove degenerate @@ -42,22 +35,24 @@ Summary: Runtime library for the %{name} application This package contains the %{name} runtime library. %prep -%autosetup -p1 +%setup -q %build %configure # Pass the -v option to libtool so we can better see what's going on -%make_build CFLAGS="%{optflags}" LIBTOOLFLAGS="-v" +make %{?_smp_mflags} CFLAGS="%{optflags}" LIBTOOLFLAGS="-v" %install -%make_install +%{make_install} # Remove the documentation installed by "make install" (rpm will handle that) rm -rf %{buildroot}%{_defaultdocdir}/%{name} # Remove the libtool archive installed by "make install" rm -f %{buildroot}%{_libdir}/lib%{name}.la +%ldconfig_scriptlets libs + %files -%doc ChangeLog ChangeLog.old README.md +%doc ChangeLog ChangeLog.old COPYING README.md AUTHORS %doc %{name}-doc.txt block.stl %{_bindir}/%{name} %{_mandir}/man1/* @@ -69,9 +64,84 @@ rm -f %{buildroot}%{_libdir}/lib%{name}.la %{_libdir}/pkgconfig/* %files libs -%doc AUTHORS -%license COPYING +%doc COPYING AUTHORS %{_libdir}/lib%{name}.so.1* %changelog -%autochangelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.98.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Oct 12 2019 Miro Hrončok - 0.98.4-1 +- Update to 0.98.4 + +* Wed Jul 24 2019 Fedora Release Engineering - 0.98.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 0.98.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 0.98.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.98.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 18 2017 Miro Hrončok - 0.98.3-1 +- Updated to 0.98.3 + +* Wed Aug 02 2017 Fedora Release Engineering - 0.98.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.98.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.98.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 0.98.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 0.98.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri May 22 2015 Miro Hrončok - 0.98.2-1 +- Updated to 0.98.2 + +* Tue Sep 23 2014 Miro Hrončok - 0.98.1-1 +- Updated to 0.98.1 + +* Fri Aug 15 2014 Fedora Release Engineering - 0.98.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 29 2014 Miro Hrončok - 0.98.0-1 +- Update to 0.98.0 + +* Sun Jun 29 2014 Miro Hrončok - 0.97.5-1 +- Update to 0.97.5 + +* Sun Jun 29 2014 Miro Hrončok - 0.97.4-1 +- Update to 0.97.4 + +* Sat Jun 07 2014 Fedora Release Engineering - 0.97.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Oct 23 2013 John C. Peterson - 0.97.2-1 +- Fixed the post and postun scriptlets (needed only for the libs subpackage) +- Fixed the requires for the devel package (namely the libs subpackage) +- Added the license file to the docs of the libs package +- Fixed the inconsistent use of spaces vs. tabs + +* Tue Oct 22 2013 John C. Peterson - 0.97.2-1 +- Added a README.Fedora file. It references the Masters Thesis associated with + the source code (because it can't be packaged due to an ambiguous copyright) +- Moved the versioned runtime libraries to a libs subpackage +- Modified the install section to use the make_install macro +- Some minor additions to the package descriptions +- Removed some extraneous info from the changelog + +* Mon Oct 21 2013 John C. Peterson - 0.97.2-1 +- Switched over to a fork of admesh that is being actively maintained. + +* Sun Sep 15 2013 John C. Peterson - 0.97.2-1 +- Initial spec file (for code from http://www.varlog.com/admesh-htm). + diff --git a/changelog b/changelog deleted file mode 100644 index 31bd7a1..0000000 --- a/changelog +++ /dev/null @@ -1,110 +0,0 @@ -* Mon Jan 22 2024 Fedora Release Engineering - 0.98.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.98.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.98.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 0.98.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Nov 21 2022 Miro Hrončok - 0.98.5-1 -- Update to 0.98.5 - -* Wed Jul 20 2022 Fedora Release Engineering - 0.98.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 0.98.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.98.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 0.98.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jul 31 2020 Fedora Release Engineering - 0.98.4-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.98.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 0.98.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Oct 12 2019 Miro Hrončok - 0.98.4-1 -- Update to 0.98.4 - -* Wed Jul 24 2019 Fedora Release Engineering - 0.98.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.98.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 0.98.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.98.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 18 2017 Miro Hrončok - 0.98.3-1 -- Updated to 0.98.3 - -* Wed Aug 02 2017 Fedora Release Engineering - 0.98.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.98.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.98.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 0.98.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 0.98.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 22 2015 Miro Hrončok - 0.98.2-1 -- Updated to 0.98.2 - -* Tue Sep 23 2014 Miro Hrončok - 0.98.1-1 -- Updated to 0.98.1 - -* Fri Aug 15 2014 Fedora Release Engineering - 0.98.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jul 29 2014 Miro Hrončok - 0.98.0-1 -- Update to 0.98.0 - -* Sun Jun 29 2014 Miro Hrončok - 0.97.5-1 -- Update to 0.97.5 - -* Sun Jun 29 2014 Miro Hrončok - 0.97.4-1 -- Update to 0.97.4 - -* Sat Jun 07 2014 Fedora Release Engineering - 0.97.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Oct 23 2013 John C. Peterson - 0.97.2-1 -- Fixed the post and postun scriptlets (needed only for the libs subpackage) -- Fixed the requires for the devel package (namely the libs subpackage) -- Added the license file to the docs of the libs package -- Fixed the inconsistent use of spaces vs. tabs - -* Tue Oct 22 2013 John C. Peterson - 0.97.2-1 -- Added a README.Fedora file. It references the Masters Thesis associated with - the source code (because it can't be packaged due to an ambiguous copyright) -- Moved the versioned runtime libraries to a libs subpackage -- Modified the install section to use the make_install macro -- Some minor additions to the package descriptions -- Removed some extraneous info from the changelog - -* Mon Oct 21 2013 John C. Peterson - 0.97.2-1 -- Switched over to a fork of admesh that is being actively maintained. - -* Sun Sep 15 2013 John C. Peterson - 0.97.2-1 -- Initial spec file (for code from http://www.varlog.com/admesh-htm). diff --git a/sources b/sources index 6b25b17..a854555 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (admesh-0.98.5.tar.gz) = 8d94966caf65ec09a143b0d9ed4a1dce1ccd6dc2281b6da02c620d6f31439c2ce4b6501bfca4392ed96727696df3a15c86890e4dd6fc995bc8cf9d130f25786a +SHA512 (admesh-0.98.4.tar.gz) = 0c196aea8d0c8082e28946e96bc3223f01485dcd6b1ef5f785e3274ec20976e6a2dbbd5fdad7b5a442d942a8d862c7705a5201275e87e127e09abbb1f0c33ce4