diff --git a/.gitignore b/.gitignore index c234d3f..17af0ba 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ OpenGL-0.62.tar.gz /OpenGL-0.6702.tar.gz /OpenGL-0.6704.tar.gz /OpenGL-0.70.tar.gz -/OpenGL-0.70_repackaged.tar.gz diff --git a/perl-OpenGL.spec b/perl-OpenGL.spec index bbe7bad..a1ee17f 100644 --- a/perl-OpenGL.spec +++ b/perl-OpenGL.spec @@ -2,18 +2,11 @@ Name: perl-OpenGL Version: %{cpanversion}00 -Release: 32%{?dist} +Release: 10%{?dist} Summary: Perl OpenGL bindings -# Automatically converted from old format: GPL+ or Artistic - review is highly recommended. -License: GPL-1.0-or-later OR Artistic-1.0-Perl +License: GPL+ or Artistic URL: http://sourceforge.net/projects/pogl/ -# -# stripped from a non-free files using ./repackage.sh %%{version} command, -# bug #1612850, -Source0: OpenGL-%{cpanversion}_repackaged.tar.gz -# GPLv2-licensed code for generating Source0 from an upstream tarball, -# bug #1612850, -Source1: repackage.sh +Source0: https://cpan.metacpan.org/authors/id/C/CH/CHM/OpenGL-%{cpanversion}.tar.gz Patch0: 0001-Don-t-check-current-display-for-extensions.patch BuildRequires: gcc # gcc-c++ for libstdc++.so linked in Makefile.PL @@ -43,6 +36,7 @@ BuildRequires: perl(DynaLoader) BuildRequires: perl(Exporter) # Tests: BuildRequires: perl(Test::More) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %{?perl_default_filter} @@ -53,11 +47,9 @@ of the OpenGL 1.0, and 1.1 functions, and most of 1.2. %prep %setup -q -n OpenGL-%{cpanversion} -%patch -P0 -p1 +%patch0 -p1 # Unbundle GL headers find include -type f \! -name glprocs.h -exec rm {} + -# Remove executable bits -find -type f -exec chmod a-x {} + %build @@ -92,73 +84,6 @@ make test %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 0.7000-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jul 07 2025 Jitka Plesnikova - 0.7000-31 -- Perl 5.42 rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 0.7000-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Aug 06 2024 Miroslav Suchý - 0.7000-29 -- convert license to SPDX - -* Fri Jul 19 2024 Fedora Release Engineering - 0.7000-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 10 2024 Jitka Plesnikova - 0.7000-27 -- Perl 5.40 rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.7000-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.7000-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 0.7000-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 Jitka Plesnikova - 0.7000-23 -- Perl 5.38 rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 0.7000-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.7000-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon May 30 2022 Jitka Plesnikova - 0.7000-20 -- Perl 5.36 rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 0.7000-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.7000-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri May 21 2021 Jitka Plesnikova - 0.7000-17 -- Perl 5.34 rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.7000-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.7000-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 22 2020 Jitka Plesnikova - 0.7000-14 -- Perl 5.32 rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 0.7000-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Nov 01 2019 Petr Pisar - 0.7000-12 -- Remove a non-free header file from the source archive (bug #1612850) -- Remove executable bits from a documentation - -* Tue Sep 17 2019 Gwyn Ciesla - 0.7000-11 -- Rebuilt for new freeglut - * Fri Jul 26 2019 Fedora Release Engineering - 0.7000-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/repackage.sh b/repackage.sh deleted file mode 100755 index 425bf76..0000000 --- a/repackage.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2010 Red Hat, Inc. -# Authors: -# Thomas Woerner -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -version=$1 -[ -z "$version" ] && { echo "Usage: $0 "; exit 1; } - -# files to be removed without the main OpenGL-/ prefix -declare -a REMOVE -REMOVE[${#REMOVE[*]}]="include/GL/glu.h" - -# no changes below this line should be needed - -orig="OpenGL-${version}" -orig_tgz="${orig}.tar.gz" -repackaged="${orig}_repackaged" -repackaged_tar="${repackaged}.tar" -repackaged_tgz="${repackaged_tar}.gz" - -# pre checks -[ ! -f "${orig_tgz}" ] && { echo "ERROR: ${orig_tgz} does not exist"; exit 1; } -[ -f "${repackaged_tgz}" ] && { echo "ERROR: ${repackaged_tgz} already exist"; exit 1; } - -# repackage -failure=0 -gzip -dc "${orig_tgz}" > "${repackaged_tar}" -for file in "${REMOVE[@]}"; do - tar -f "${repackaged_tar}" --delete "${orig}/${file}" >> repackage.log - [ $? != 0 ] && { echo "ERROR: Could not remove file ${orig}/${file} from archive."; failure=1; } || echo "Removed ${orig}/${file} from archive." -done -[ $failure != 0 ] && { echo "See repackage.log for details."; exit 1; } -gzip -9 -n "${repackaged_tar}" - -# post checks -RET=0 -for file in "${REMOVE[@]}"; do - found=$(tar -ztvf "${repackaged_tgz}" | grep "${file}") - [ -n "$found" ] && { echo "ERROR: file ${file} is still in the repackaged archive."; RET=1; } -done - -[ $RET == 0 ] && echo "Sucessfully repackaged ${orig}: ${repackaged_tgz}" - -exit $RET diff --git a/sources b/sources index 4a7b145..3985ee9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenGL-0.70_repackaged.tar.gz) = a5e352a49928f6c7eb2005efbe369f62d50a862f98980f45561570b550b0cf5bc2dee5370040ae39a6d5b1501e66e80a2d979c8419d194bd92b527ffa00fd637 +SHA512 (OpenGL-0.70.tar.gz) = 7d418015b2553dd69805252b5957bc97013260617d5a358f692e29b8da884590421c81fbc71d4dd678c93a5c89047d6af8c32f15bf0bd0e4ce514c200e634af5