Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
SOURCES/plotutils-2.6.tar.gz
|
plotutils-2.5.tar.gz
|
||||||
|
/plotutils-2.6.tar.gz
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
7921301d9dfe8991e3df2829bd733df6b2a70838 SOURCES/plotutils-2.6.tar.gz
|
|
||||||
54
plotutils-configure-c99.patch
Normal file
54
plotutils-configure-c99.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
Do not call the undeclared exit function. This avoids build problems
|
||||||
|
with future compilers which do not support implicit function
|
||||||
|
declarations.
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index 229ccd453ae4487f..fdf3785ad4c5175f 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -19537,9 +19537,9 @@ int main()
|
||||||
|
|| fflush ((FILE *)0) < 0
|
||||||
|
|| (fpr = fopen ("conftest0", "r")) == (FILE *)0
|
||||||
|
|| fread (test_array, 1, 7, fpr) != 7)
|
||||||
|
- exit (1);
|
||||||
|
+ return 1;
|
||||||
|
else
|
||||||
|
- exit(0); }
|
||||||
|
+ return 0; }
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest$ac_exeext
|
||||||
|
if { (ac_try="$ac_link"
|
||||||
|
@@ -24022,7 +24022,7 @@ int main()
|
||||||
|
int i;
|
||||||
|
for (i=0; i < B; i++)
|
||||||
|
Array[i] = i - 3;
|
||||||
|
- exit (Array[1] != -2);
|
||||||
|
+ return Array[1] != -2;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest$ac_exeext
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 8fb7b640864eb4a8..d1f6d7e08c6946d4 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -88,9 +88,9 @@ int main()
|
||||||
|
|| fflush ((FILE *)0) < 0
|
||||||
|
|| (fpr = fopen ("conftest0", "r")) == (FILE *)0
|
||||||
|
|| fread (test_array, 1, 7, fpr) != 7)
|
||||||
|
- exit (1);
|
||||||
|
+ return 1;
|
||||||
|
else
|
||||||
|
- exit(0); }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NULL_FLUSH)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
|
||||||
|
+ return 0; }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NULL_FLUSH)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
|
||||||
|
|
||||||
|
# Checks for header files: ANSI C, POSIX, and nonstandard Unix headers.
|
||||||
|
AC_HEADER_STDC
|
||||||
|
@@ -383,7 +383,7 @@ int main()
|
||||||
|
int i;
|
||||||
|
for (i=0; i < B; i++)
|
||||||
|
Array[[i]] = i - 3;
|
||||||
|
- exit (Array[[1]] != -2);
|
||||||
|
+ return Array[[1]] != -2;
|
||||||
|
}]])],
|
||||||
|
[ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
|
||||||
|
if test "$ac_cv_c_gcc_strength_bug" = "yes"
|
||||||
@ -1,16 +1,17 @@
|
|||||||
Name: plotutils
|
Name: plotutils
|
||||||
Version: 2.6
|
Version: 2.6
|
||||||
Release: 20%{?dist}
|
Release: 37%{?dist}
|
||||||
Summary: GNU vector and raster graphics utilities and libraries
|
Summary: GNU vector and raster graphics utilities and libraries
|
||||||
|
|
||||||
# libxmi is GPLv2+
|
# libxmi is GPLv2+
|
||||||
# rest is GPLv3+
|
# rest is GPLv3+
|
||||||
License: GPLv2+ and GPLv3+
|
License: GPL-2.0-or-later AND GPL-3.0-or-later
|
||||||
URL: http://www.gnu.org/software/plotutils/
|
URL: http://www.gnu.org/software/plotutils/
|
||||||
Source0: ftp://ftp.gnu.org/gnu/plotutils/plotutils-%{version}.tar.gz
|
Source0: ftp://ftp.gnu.org/gnu/plotutils/plotutils-%{version}.tar.gz
|
||||||
Patch0: plotutils-2.6-png15.patch
|
Patch0: plotutils-2.6-png15.patch
|
||||||
Patch1: plotutils-aarch64.patch
|
Patch1: plotutils-aarch64.patch
|
||||||
Patch2: plotutils-werror-format-security.patch
|
Patch2: plotutils-werror-format-security.patch
|
||||||
|
Patch3: plotutils-configure-c99.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
@ -23,10 +24,6 @@ BuildRequires: libXt-devel
|
|||||||
BuildRequires: libXext-devel
|
BuildRequires: libXext-devel
|
||||||
BuildRequires: byacc
|
BuildRequires: byacc
|
||||||
|
|
||||||
Requires(post): /sbin/install-info
|
|
||||||
Requires(post): /sbin/ldconfig
|
|
||||||
Requires(preun): /sbin/install-info
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The GNU plotutils package contains software for both programmers and
|
The GNU plotutils package contains software for both programmers and
|
||||||
technical users. Its centerpiece is libplot, a powerful C/C++ function
|
technical users. Its centerpiece is libplot, a powerful C/C++ function
|
||||||
@ -51,6 +48,9 @@ applications
|
|||||||
%patch0 -p1 -b .png15
|
%patch0 -p1 -b .png15
|
||||||
%patch1 -p1 -b .aarch64
|
%patch1 -p1 -b .aarch64
|
||||||
%patch2 -p1 -b .format-security
|
%patch2 -p1 -b .format-security
|
||||||
|
%patch3 -p1
|
||||||
|
# Avoid attempting autotools rebuild.
|
||||||
|
touch -r aclocal.m4 configure*
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static --enable-libplotter --enable-libxmi --enable-ps-fonts-in-pcl
|
%configure --disable-static --enable-libplotter --enable-libxmi --enable-ps-fonts-in-pcl
|
||||||
@ -73,25 +73,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/tek2plot docs-to-include
|
|||||||
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
|
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
|
||||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||||
|
|
||||||
|
|
||||||
%post
|
|
||||||
/sbin/install-info %{_infodir}/libxmi.info %{_infodir}/dir || :
|
|
||||||
/sbin/install-info %{_infodir}/plotutils.info %{_infodir}/dir || :
|
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
|
|
||||||
%preun
|
|
||||||
if [ $1 = 0 ]; then
|
|
||||||
/sbin/install-info --delete %{_infodir}/libxmi.info %{_infodir}/dir || :
|
|
||||||
/sbin/install-info --delete %{_infodir}/plotutils.info %{_infodir}/dir || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-, root, root, -)
|
|
||||||
%doc AUTHORS COMPAT COPYING NEWS THANKS README PROBLEMS KNOWN_BUGS
|
%doc AUTHORS COMPAT COPYING NEWS THANKS README PROBLEMS KNOWN_BUGS
|
||||||
%doc docs-to-include/*
|
%doc docs-to-include/*
|
||||||
%{_bindir}/graph
|
%{_bindir}/graph
|
||||||
@ -115,6 +97,58 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.6-37
|
||||||
|
- Bump release for October 2024 mass rebuild:
|
||||||
|
Resolves: RHEL-64018
|
||||||
|
|
||||||
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.6-36
|
||||||
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
* Thu May 23 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.6-35
|
||||||
|
- Convert to SPDX license tag
|
||||||
|
|
||||||
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-34
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-33
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-32
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-31
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 18 2023 Florian Weimer <fweimer@redhat.com> - 2.6-30
|
||||||
|
- Port configure script to C99 (#2161952)
|
||||||
|
|
||||||
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-29
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-28
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-27
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-26
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-25
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-24
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-23
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-22
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-21
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Feb 19 2018 Michael Simacek <msimacek@redhat.com> - 2.6-20
|
* Mon Feb 19 2018 Michael Simacek <msimacek@redhat.com> - 2.6-20
|
||||||
- Add BR on gcc-c++ and make
|
- Add BR on gcc-c++ and make
|
||||||
- Remove deprecated Group tag
|
- Remove deprecated Group tag
|
||||||
Loading…
Reference in New Issue
Block a user