8
0

Accepting request 947793 from home:adra:branches:devel:languages:perl

Updated License to (Artistic-1.0 OR GPL-1.0-or-later) AND TCL, Updated build requirements

OBS-URL: https://build.opensuse.org/request/show/947793
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Tk-TableMatrix?expand=0&rev=14
This commit is contained in:
2022-01-28 10:09:12 +00:00
committed by Git OBS Bridge
parent eaf389b3ec
commit 11bf7de217
3 changed files with 42 additions and 35 deletions

View File

@@ -1,8 +1,10 @@
---
#description_paragraphs: 3
#description: |-
description: |-
Tk::TableMatrix is a table/matrix widget extension to perl/tk
for displaying data in a table (or spreadsheet) format.
# override description from CPAN
#summary: override summary from CPAN
summary: Table/Matrix Widget Extension to perl/tk
#no_testing: broken upstream
#sources:
# - source1
@@ -12,24 +14,22 @@
# bar.patch:
preamble: |-
BuildRequires: perl-Tk-devel
BuildRequires: xorg-x11
BuildRequires: xorg-x11-Xnest
BuildRequires: xorg-x11-Xvfb
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-fonts-100dpi
BuildRequires: xorg-x11-fonts-75dpi
BuildRequires: xorg-x11-fonts-scalable
BuildRequires: dos2unix
post_prep: |-
if test "%_lib" = "lib64" ; then
sed -i -e "s,/lib>,/lib64>," -e "s,/lib\",/lib64\"," myConfig
if test "%{_lib}" = "lib64" ; then
sed -i -e "s,/lib>,/lib64>," -e "s,/lib\",/lib64\"," myConfig
fi
dos2unix README ChangeLog Changes demos/*
# Fix rpmlint warning "wrong-file-end-of-line-encoding"
sed -i 's/\r$//' ChangeLog Changes README demos/*
# Copy license
cp -a pTk/license.terms license.terms.pTk
cp -a pTk/mTk/license.terms license.terms.mTk
#post_build: |-
# rm unused.files
#post_install: |-
# sed on %{name}.files
license: (GPL-1.0-or-later OR Artistic-1.0) AND Zlib
license: (Artistic-1.0 OR GPL-1.0-or-later) AND TCL
#skip_noarch: 1
#custom_build: |-
#./Build build flags=%{?_smp_mflags} --myflag
@@ -37,4 +37,4 @@ license: (GPL-1.0-or-later OR Artistic-1.0) AND Zlib
#startserver && make test
#ignore_requires: Bizarre::Module
skip_doc: debug.* myConfig
add_doc: demos
add_doc: demos license.terms.pTk license.terms.mTk

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jan 20 23:16:40 UTC 2022 - Asterios Dramis <asterios.dramis@gmail.com>
- Updated License to "(Artistic-1.0 OR GPL-1.0-or-later) AND TCL".
- Added perl(ExtUtils::MakeMaker) build requirement.
- Removed dos2unix, xorg-x11, xorg-x11-Xnest, xorg-x11-Xvfb,
xorg-x11-fonts-100dpi, xorg-x11-fonts-75dpi and
xorg-x11-fonts-scalable build requirements (not needed anymore).
- Run spec cleaner.
-------------------------------------------------------------------
Thu Oct 29 11:03:12 UTC 2020 - Dirk Stoecker <opensuse@dstoecker.de>

View File

@@ -1,7 +1,7 @@
#
# spec file for package perl-Tk-TableMatrix
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,53 +16,51 @@
#
%define cpan_name Tk-TableMatrix
Name: perl-Tk-TableMatrix
Version: 1.26
Release: 0
#Upstream: CHECK(Artistic-1.0 or GPL-1.0-or-later)
%define cpan_name Tk-TableMatrix
Summary: Tk::tkTable - a Spreadsheet/Table Widget
License: (GPL-1.0-or-later OR Artistic-1.0) AND Zlib
Group: Development/Libraries/Perl
License: (Artistic-1.0 OR GPL-1.0-or-later) AND TCL
Summary: Table/Matrix Widget Extension to perl/tk
URL: https://metacpan.org/release/%{cpan_name}
Source0: https://cpan.metacpan.org/authors/id/A/AS/ASB/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.52
BuildRequires: perl(Tk) >= 800.022
BuildRequires: perl(Tk::MMtry)
BuildRequires: perl(Tk::MMutil)
Requires: perl(Tk) >= 800.022
%{perl_requires}
# MANUAL BEGIN
BuildRequires: dos2unix
BuildRequires: perl-Tk-devel
BuildRequires: xorg-x11
BuildRequires: xorg-x11-Xnest
BuildRequires: xorg-x11-Xvfb
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-fonts-100dpi
BuildRequires: xorg-x11-fonts-75dpi
BuildRequires: xorg-x11-fonts-scalable
# MANUAL END
%description
Tk::tkTable - a Spreadsheet/Table Widget
Tk::TableMatrix is a table/matrix widget extension to perl/tk
for displaying data in a table (or spreadsheet) format.
%prep
%setup -q -n %{cpan_name}-%{version}
%autosetup -n %{cpan_name}-%{version}
find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path "*/script/*" ! -name "configure" -print0 | xargs -0 chmod 644
# MANUAL BEGIN
if test "%_lib" = "lib64" ; then
sed -i -e "s,/lib>,/lib64>," -e "s,/lib\",/lib64\"," myConfig
if test "%{_lib}" = "lib64" ; then
sed -i -e "s,/lib>,/lib64>," -e "s,/lib\",/lib64\"," myConfig
fi
dos2unix README ChangeLog Changes demos/*
# Fix rpmlint warning "wrong-file-end-of-line-encoding"
sed -i 's/\r$//' ChangeLog Changes README demos/*
# Copy license
cp -a pTk/license.terms license.terms.pTk
cp -a pTk/mTk/license.terms license.terms.mTk
# MANUAL END
%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}
%make_build
%check
make test
@@ -73,8 +71,7 @@ make test
%perl_gen_filelist
%files -f %{name}.files
%defattr(-,root,root,755)
%doc ChangeLog Changes demos README
%license COPYING
%license COPYING license.terms.mTk license.terms.pTk
%changelog