dmoluguw pushed to pki-core (f31). "Rebased to upstream PKI
v10.9.0-b2 (..more)"
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 23:45:20 UTC
From 401c24d65291b22183504a22d98ba86016ea5b4d Mon Sep 17 00:00:00 2001
From: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Jun 30 2020 23:45:05 +0000
Subject: Rebased to upstream PKI v10.9.0-b2
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
---
diff --git a/.gitignore b/.gitignore
index f5b2781..7ccb728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@
/pki-10.7.3.tar.gz
/pki-10.8.3.tar.gz
/pki-10.9.0-a2.tar.gz
+/pki-10.9.0-b2.tar.gz
diff --git a/0001-pki-password-fix-for-FIPS.patch b/0001-pki-password-fix-for-FIPS.patch
new file mode 100644
index 0000000..5f3f691
--- /dev/null
+++ b/0001-pki-password-fix-for-FIPS.patch
@@ -0,0 +1,39 @@
+From d6c91ee4a11a55534c733d144b3108e16b0ac6aa Mon Sep 17 00:00:00 2001
+From: Christian Heimes <cheimes(a)redhat.com>
+Date: Tue, 30 Jun 2020 17:22:35 +0200
+Subject: [PATCH] pki password fix for FIPS
+
+NSS DB in FIPS mode seems to require a password in all cases. When pki
+attemps to open NSS DB without password in FIPS mode, it blocks with a
+prompt to enter a password. This breaks installation in FIPS mode:
+
+ Enter password for NSS FIPS 140-2 User Private Key
+
+Signed-off-by: Christian Heimes <cheimes(a)redhat.com>
+---
+ base/server/python/pki/server/subsystem.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/base/server/python/pki/server/subsystem.py b/base/server/python/pki/server/subsystem.py
+index 737b4b233..cc65954f6 100644
+--- a/base/server/python/pki/server/subsystem.py
++++ b/base/server/python/pki/server/subsystem.py
+@@ -949,6 +949,7 @@ class PKISubsystem(object):
+ cmd = [
+ 'pki',
+ '-d', self.instance.nssdb_dir,
++ '-f', self.instance.password_conf,
+ '-U', master_url,
+ '%s-range-request' % self.name,
+ range_type,
+@@ -996,6 +997,7 @@ class PKISubsystem(object):
+ cmd = [
+ 'pki',
+ '-d', self.instance.nssdb_dir,
++ '-f', self.instance.password_conf,
+ '-U', master_url,
+ '%s-config-export' % self.name,
+ '--names', ','.join(names),
+--
+2.26.2
+
diff --git a/pki-core.spec b/pki-core.spec
index a88b635..e39af4a 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,8 +8,8 @@ URL: http://www.dogtagpki.org/
License: GPLv2 and LGPLv2
Version: 10.9.0
-Release: 0.2%{?_timestamp}%{?_commit_id}%{?dist}
-%global _phase -a2
+Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist}
+%global _phase -b2
# To create a tarball from a version tag:
# $ git archive \
@@ -26,6 +26,8 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
# > pki-VERSION-RELEASE.patch
# Patch: pki-VERSION-RELEASE.patch
+Patch1: 0001-pki-password-fix-for-FIPS.patch
+
################################################################################
# NSS
################################################################################
@@ -200,6 +202,7 @@ BuildRequires: resteasy-jackson2-provider >= 3.0.17-1
BuildRequires: python3 >= 3.5
BuildRequires: python3-devel
+BuildRequires: python3-setuptools
BuildRequires: python3-cryptography
BuildRequires: python3-lxml
BuildRequires: python3-ldap
@@ -1316,6 +1319,10 @@ fi
################################################################################
%changelog
+* Tue Jun 30 2020 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.9.0-0.4
+- Rebase to match upstream beta version v10.9.0-b2
+- pki password fix for FIPS
+
* Wed Jun 10 2020 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.9.0-0.2
- Rebase to match upstream alpha version 10.9.0-a2
diff --git a/sources b/sources
index 7dea355..0e1c6d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.9.0-a2.tar.gz) = 1e82038cd1107d76a5d7a49bf9088fbf36c6835d62dbb650f3e933b94e5438749ad0f39d61b2c8df7fdcd9327b70d496041e390c60ccaa1cdf253c69a5a691af
+SHA512 (pki-10.9.0-b2.tar.gz) = 49f817d17a1442bcbec86c4f2717a2489d2655329f9d2d5ea97e73aaffb4924f2855898952568717c821188e8e05dfb05ee7afee9918c27a218e8f199a24777e
https://src.fedoraproject.org/rpms/pki-core/c/401c24d65291b22183504a22d98...
3 years, 8 months
pagure pushed to lua (master). "Add lua(abi) requirements generator
(requires RPM 4.16+) (..more)"
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 23:44:55 UTC
From ab3d82cbb92fc43f95181ea3766cb6b3d63b8301 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro(a)hroncok.cz>
Date: Jun 30 2020 23:26:06 +0000
Subject: Add lua(abi) requirements generator (requires RPM 4.16+)
Any package that installs to /usr/lib(64)/lua/X.Y/ or /usr/share/lua/X.Y/
will require lua(abi) = X.Y.
Co-own the RPM directories to avoid a dependency on RPM (or not owned directory).
---
diff --git a/lua.attr b/lua.attr
new file mode 100644
index 0000000..a433266
--- /dev/null
+++ b/lua.attr
@@ -0,0 +1,19 @@
+%__lua_requires() %{lua:
+ -- Match buildroot paths of the form
+ -- /PATH/OF/BUILDROOT/usr/lib(64)/lua/MAJOR.MINOR/ and
+ -- /PATH/OF/BUILDROOT/usr/share/pythonMAJOR.MINOR/
+ -- generating a line of the form:
+ -- lua(abi) = MAJOR.MINOR
+ local path = rpm.expand('%1')
+ local datadir = rpm.expand('%_datadir')
+ local libdir = rpm.expand('%_libdir')
+ for i, dir in ipairs({datadir, libdir}) do
+ if path:match(dir .. '/lua/%d+%.%d+/.*') then
+ local requires = path:gsub('.*' .. dir .. '/lua/(%d+%.%d+)/.*', 'lua(abi) = %1')
+ print(requires)
+ break
+ end
+ end
+}
+
+%__lua_path ^(%{_datadir}|%{_libdir})/lua/[[:digit:]]+\\.[[:digit:]]+/.+
diff --git a/lua.spec b/lua.spec
index b3d8cdc..dad0933 100644
--- a/lua.spec
+++ b/lua.spec
@@ -15,7 +15,7 @@
Name: lua
Version: %{major_version}.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Powerful light-weight programming language
License: MIT
URL: http://www.lua.org/
@@ -30,6 +30,8 @@ Source3: http://www.lua.org/tests/lua-%{test_version}-tests.tar.gz
Source4: luaconf.h
# rpm-macro
Source1000: macros.lua
+# rpm-generator
+Source1001: lua.attr
Patch0: %{name}-5.4.0-beta-autotoolize.patch
Patch1: %{name}-5.3.0-idsize.patch
#Patch2: %%{name}-5.3.0-luac-shared-link-fix.patch
@@ -173,8 +175,9 @@ rm -rf $RPM_BUILD_ROOT/installdir
popd
%endif
-# Install rpm-macro
+# Install rpm-macro and requires generator
install -Dpm 0644 %{SOURCE1000} $RPM_BUILD_ROOT/%{macrosdir}/macros.lua
+install -Dpm 0644 %{SOURCE1001} $RPM_BUILD_ROOT/%{_fileattrsdir}/lua.attr
%files
%{!?_licensedir:%global license %%doc}
@@ -203,13 +206,19 @@ install -Dpm 0644 %{SOURCE1000} $RPM_BUILD_ROOT/%{macrosdir}/macros.lua
%{_includedir}/l*.hpp
%{_libdir}/liblua.so
%{_libdir}/pkgconfig/*.pc
+%dir %{macrosdir}
%{macrosdir}/macros.lua
+%dir %{_fileattrsdir}
+%{_fileattrsdir}/lua.attr
%files static
%{_libdir}/*.a
%changelog
+* Tue Jun 30 2020 Miro Hrončok <mhroncok(a)redhat.com> - 5.4.0-2
+- Add lua(abi) requirements generator (requires RPM 4.16+)
+
* Mon Jun 29 2020 Tom Callaway <spot(a)fedoraproject.org> - 5.4.0-1
- update to 5.4.0
https://src.fedoraproject.org/rpms/lua/c/ab3d82cbb92fc43f95181ea3766cb6b3...
3 years, 8 months
dmoluguw pushed to pki-core (f32). "Rebased to upstream PKI
v10.9.0-b2 (..more)"
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 23:43:54 UTC
From ed8ea7501ce212e575802e1d922c3420807b06c7 Mon Sep 17 00:00:00 2001
From: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Jun 30 2020 23:43:31 +0000
Subject: Rebased to upstream PKI v10.9.0-b2
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
---
diff --git a/.gitignore b/.gitignore
index f5b2781..7ccb728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@
/pki-10.7.3.tar.gz
/pki-10.8.3.tar.gz
/pki-10.9.0-a2.tar.gz
+/pki-10.9.0-b2.tar.gz
diff --git a/0001-pki-password-fix-for-FIPS.patch b/0001-pki-password-fix-for-FIPS.patch
new file mode 100644
index 0000000..5f3f691
--- /dev/null
+++ b/0001-pki-password-fix-for-FIPS.patch
@@ -0,0 +1,39 @@
+From d6c91ee4a11a55534c733d144b3108e16b0ac6aa Mon Sep 17 00:00:00 2001
+From: Christian Heimes <cheimes(a)redhat.com>
+Date: Tue, 30 Jun 2020 17:22:35 +0200
+Subject: [PATCH] pki password fix for FIPS
+
+NSS DB in FIPS mode seems to require a password in all cases. When pki
+attemps to open NSS DB without password in FIPS mode, it blocks with a
+prompt to enter a password. This breaks installation in FIPS mode:
+
+ Enter password for NSS FIPS 140-2 User Private Key
+
+Signed-off-by: Christian Heimes <cheimes(a)redhat.com>
+---
+ base/server/python/pki/server/subsystem.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/base/server/python/pki/server/subsystem.py b/base/server/python/pki/server/subsystem.py
+index 737b4b233..cc65954f6 100644
+--- a/base/server/python/pki/server/subsystem.py
++++ b/base/server/python/pki/server/subsystem.py
+@@ -949,6 +949,7 @@ class PKISubsystem(object):
+ cmd = [
+ 'pki',
+ '-d', self.instance.nssdb_dir,
++ '-f', self.instance.password_conf,
+ '-U', master_url,
+ '%s-range-request' % self.name,
+ range_type,
+@@ -996,6 +997,7 @@ class PKISubsystem(object):
+ cmd = [
+ 'pki',
+ '-d', self.instance.nssdb_dir,
++ '-f', self.instance.password_conf,
+ '-U', master_url,
+ '%s-config-export' % self.name,
+ '--names', ','.join(names),
+--
+2.26.2
+
diff --git a/pki-core.spec b/pki-core.spec
index ff0e88a..35e973f 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,8 +8,8 @@ URL: http://www.dogtagpki.org/
License: GPLv2 and LGPLv2
Version: 10.9.0
-Release: 0.2%{?_timestamp}%{?_commit_id}%{?dist}
-%global _phase -a2
+Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist}
+%global _phase -b2
# To create a tarball from a version tag:
# $ git archive \
@@ -26,6 +26,8 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
# > pki-VERSION-RELEASE.patch
# Patch: pki-VERSION-RELEASE.patch
+Patch1: 0001-pki-password-fix-for-FIPS.patch
+
################################################################################
# NSS
################################################################################
@@ -200,6 +202,7 @@ BuildRequires: resteasy-jackson2-provider >= 3.0.17-1
BuildRequires: python3 >= 3.5
BuildRequires: python3-devel
+BuildRequires: python3-setuptools
BuildRequires: python3-cryptography
BuildRequires: python3-lxml
BuildRequires: python3-ldap
@@ -1316,6 +1319,10 @@ fi
################################################################################
%changelog
+* Tue Jun 30 2020 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.9.0-0.4
+- Rebase to match upstream beta version v10.9.0-b2
+- pki password fix for FIPS
+
* Wed Jun 10 2020 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.9.0-0.2
- Rebase to match upstream alpha version 10.9.0-a2
diff --git a/sources b/sources
index 7dea355..0e1c6d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.9.0-a2.tar.gz) = 1e82038cd1107d76a5d7a49bf9088fbf36c6835d62dbb650f3e933b94e5438749ad0f39d61b2c8df7fdcd9327b70d496041e390c60ccaa1cdf253c69a5a691af
+SHA512 (pki-10.9.0-b2.tar.gz) = 49f817d17a1442bcbec86c4f2717a2489d2655329f9d2d5ea97e73aaffb4924f2855898952568717c821188e8e05dfb05ee7afee9918c27a218e8f199a24777e
https://src.fedoraproject.org/rpms/pki-core/c/ed8ea7501ce212e575802e1d922...
3 years, 8 months
dmoluguw pushed to pki-core (master). "Rebased to upstream PKI
v10.9.0-b2 (..more)"
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 23:41:00 UTC
From 7b33405892d60aa1e834697d666451d646f7c17d Mon Sep 17 00:00:00 2001
From: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Jun 30 2020 23:40:25 +0000
Subject: Rebased to upstream PKI v10.9.0-b2
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
---
diff --git a/.gitignore b/.gitignore
index f5b2781..7ccb728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@
/pki-10.7.3.tar.gz
/pki-10.8.3.tar.gz
/pki-10.9.0-a2.tar.gz
+/pki-10.9.0-b2.tar.gz
diff --git a/0001-pki-password-fix-for-FIPS.patch b/0001-pki-password-fix-for-FIPS.patch
new file mode 100644
index 0000000..5f3f691
--- /dev/null
+++ b/0001-pki-password-fix-for-FIPS.patch
@@ -0,0 +1,39 @@
+From d6c91ee4a11a55534c733d144b3108e16b0ac6aa Mon Sep 17 00:00:00 2001
+From: Christian Heimes <cheimes(a)redhat.com>
+Date: Tue, 30 Jun 2020 17:22:35 +0200
+Subject: [PATCH] pki password fix for FIPS
+
+NSS DB in FIPS mode seems to require a password in all cases. When pki
+attemps to open NSS DB without password in FIPS mode, it blocks with a
+prompt to enter a password. This breaks installation in FIPS mode:
+
+ Enter password for NSS FIPS 140-2 User Private Key
+
+Signed-off-by: Christian Heimes <cheimes(a)redhat.com>
+---
+ base/server/python/pki/server/subsystem.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/base/server/python/pki/server/subsystem.py b/base/server/python/pki/server/subsystem.py
+index 737b4b233..cc65954f6 100644
+--- a/base/server/python/pki/server/subsystem.py
++++ b/base/server/python/pki/server/subsystem.py
+@@ -949,6 +949,7 @@ class PKISubsystem(object):
+ cmd = [
+ 'pki',
+ '-d', self.instance.nssdb_dir,
++ '-f', self.instance.password_conf,
+ '-U', master_url,
+ '%s-range-request' % self.name,
+ range_type,
+@@ -996,6 +997,7 @@ class PKISubsystem(object):
+ cmd = [
+ 'pki',
+ '-d', self.instance.nssdb_dir,
++ '-f', self.instance.password_conf,
+ '-U', master_url,
+ '%s-config-export' % self.name,
+ '--names', ','.join(names),
+--
+2.26.2
+
diff --git a/pki-core.spec b/pki-core.spec
index 24fad5c..45e7c9e 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,8 +8,8 @@ URL: http://www.dogtagpki.org/
License: GPLv2 and LGPLv2
Version: 10.9.0
-Release: 0.2%{?_timestamp}%{?_commit_id}%{?dist}
-%global _phase -a2
+Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist}
+%global _phase -b2
# To create a tarball from a version tag:
# $ git archive \
@@ -26,6 +26,8 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
# > pki-VERSION-RELEASE.patch
# Patch: pki-VERSION-RELEASE.patch
+Patch1: 0001-pki-password-fix-for-FIPS.patch
+
################################################################################
# NSS
################################################################################
@@ -200,6 +202,7 @@ BuildRequires: resteasy-jackson2-provider >= 3.0.17-1
BuildRequires: python3 >= 3.5
BuildRequires: python3-devel
+BuildRequires: python3-setuptools
BuildRequires: python3-cryptography
BuildRequires: python3-lxml
BuildRequires: python3-ldap
@@ -1316,6 +1319,10 @@ fi
################################################################################
%changelog
+* Tue Jun 30 2020 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.9.0-0.4
+- Rebase to match upstream beta version v10.9.0-b2
+- pki password fix for FIPS
+
* Wed Jun 10 2020 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.9.0-0.2
- Rebase to match upstream alpha version 10.9.0-a2
diff --git a/sources b/sources
index 7dea355..0e1c6d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.9.0-a2.tar.gz) = 1e82038cd1107d76a5d7a49bf9088fbf36c6835d62dbb650f3e933b94e5438749ad0f39d61b2c8df7fdcd9327b70d496041e390c60ccaa1cdf253c69a5a691af
+SHA512 (pki-10.9.0-b2.tar.gz) = 49f817d17a1442bcbec86c4f2717a2489d2655329f9d2d5ea97e73aaffb4924f2855898952568717c821188e8e05dfb05ee7afee9918c27a218e8f199a24777e
https://src.fedoraproject.org/rpms/pki-core/c/7b33405892d60aa1e834697d666...
3 years, 8 months
packagerbot pushed to dummy-test-package-rubino (master). "Bump
release (..more)"
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 22:56:14 UTC
From 08f646a10046bd357dfc673b26481bf49b561116 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Jun 30 2020 22:56:09 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-rubino.spec b/dummy-test-package-rubino.spec
index bc3668c..4af2870 100644
--- a/dummy-test-package-rubino.spec
+++ b/dummy-test-package-rubino.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-rubino
Version: 0
-Release: 724%{?dist}
+Release: 725%{?dist}
Summary: Dummy Test Package called Rubino
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -34,6 +34,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Tue Jun 30 2020 packagerbot <admin(a)fedoraproject.org> - 0-725
+- rebuilt
+
* Tue Jun 30 2020 packagerbot <admin(a)fedoraproject.org> - 0-724
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-rubino/c/08f646a100...
3 years, 8 months
packagerbot pushed to dummy-test-package-crested (master). "Bump
release (..more)"
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 22:56:05 UTC
From f54cf30c2fc0024b7dd5f3a083d239ce643d04e4 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Jun 30 2020 22:56:00 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-crested.spec b/dummy-test-package-crested.spec
index e06785b..0143ae2 100644
--- a/dummy-test-package-crested.spec
+++ b/dummy-test-package-crested.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-crested
Version: 0
-Release: 724%{?dist}
+Release: 725%{?dist}
Summary: Dummy Test Package called Crested
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Tue Jun 30 2020 packagerbot <admin(a)fedoraproject.org> - 0-725
+- rebuilt
+
* Tue Jun 30 2020 packagerbot <admin(a)fedoraproject.org> - 0-724
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-crested/c/f54cf30c2...
3 years, 8 months
sdgathman pushed to abcMIDI (epel8). "Merge branch 'master' into
epel8"
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 22:45:05 UTC
From 7895711941baaad7657baa405e156f3b190a8219 Mon Sep 17 00:00:00 2001
From: Stuart D. Gathman <stuart(a)gathman.org>
Date: Jun 30 2020 22:44:19 +0000
Subject: Merge branch 'master' into epel8
---
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
--- a/.cvsignore
+++ /dev/null
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9497259
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+abcMIDI-*.zip
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4fc6be3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: abcMIDI
-# $Id$
-NAME := abcMIDI
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/abcMIDI.spec b/abcMIDI.spec
new file mode 100644
index 0000000..f3eac06
--- /dev/null
+++ b/abcMIDI.spec
@@ -0,0 +1,138 @@
+Name: abcMIDI
+Version: 2020.06.29
+Release: 1%{?dist}
+Summary: ABC to/from MIDI conversion utilities
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: https://ifdo.ca/~seymour/runabc/top.html
+Source0: https://ifdo.ca/~seymour/runabc/%{name}-%{version}.zip
+BuildRequires: gcc dos2unix
+
+%description
+The abcMIDI package contains four programs: abc2midi to convert ABC
+music notation to MIDI, midi2abc to convert MIDI files to (a first
+approximation to) the corresponding ABC, abc2abc to reformat and/or
+transpose ABC files, and yaps to typeset ABC files as PostScript.
+
+For a description of the ABC syntax, please see the ABC userguide
+which is a part of the abcm2ps.
+
+A mirror github repo is at https://github.com/sdgathman/abcmidi
+
+
+%prep
+%setup -q -n abcmidi
+find . -type f | xargs dos2unix
+# make license easier to find in files
+mv doc/gpl.txt doc/LICENSE
+
+%build
+%configure
+%{make_build}
+
+%install
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 755 abc2midi %{buildroot}%{_bindir}
+install -p -m 755 abcmatch %{buildroot}%{_bindir}
+install -p -m 755 midi2abc %{buildroot}%{_bindir}
+install -p -m 755 midicopy %{buildroot}%{_bindir}
+install -p -m 755 abc2abc %{buildroot}%{_bindir}
+install -p -m 755 mftext %{buildroot}%{_bindir}
+install -p -m 755 yaps %{buildroot}%{_bindir}
+
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/abc2abc.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/abc2midi.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/mftext.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/midi2abc.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/midicopy.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1
+
+
+%files
+%license doc/LICENSE
+%doc doc/programming VERSION doc/*.txt doc/AUTHORS doc/CHANGES
+%{_mandir}/man*/*
+%{_bindir}/*
+
+
+%changelog
+* Mon Jun 29 2020 Stuart Gathman <stuart(a)gathman.org> - 2020.06.29-1
+- New upstream release
+
+* Tue Jun 02 2020 Stuart Gathman <stuart(a)gathman.org> - 2020.05.06-2
+- Patch some warnings and dup globals
+
+* Mon Jun 01 2020 Stuart Gathman <stuart(a)gathman.org> - 2020.05.06-1
+- New upstream release
+
+* Sun Mar 22 2020 Stuart Gathman <stuart(a)gathman.org> - 2020.02.12-1
+- New release 2020-02-12
+
+* Sun Nov 12 2017 Stuart Gathman <stuart(a)gathman.org> - 2013.04.30-1
+- New release 2013-04-30
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 20090317-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 20090317-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 13 2009 Gerard Milmeister <gemi(a)bluewin.ch> - 20090317-1
+- new release 2009-03-17
+
+* Wed Sep 24 2008 Gerard Milmeister <gemi(a)bluewin.ch> - 20080924-1
+- new release 2008-09-24
+
+* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 20070106-3
+- fix license tag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 20070106-2
+- Autorebuild for GCC 4.3
+
+* Tue Jan 9 2007 Gerard Milmeister <gemi(a)bluewin.ch> - 20070106-1
+- new version 20070106
+
+* Wed Dec 13 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061211-1
+- new version 20061211
+
+* Mon Nov 6 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061103-1
+- new version 20061103
+
+* Tue Oct 31 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061027-1
+- new version 20061027
+
+* Mon Oct 16 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061015-1
+- new version 20061015
+
+* Mon Oct 9 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061005-1
+- new version 20061005
+
+* Mon Sep 11 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060910-1
+- new version 20060910
+
+* Wed Aug 30 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060829-1
+- new version 20060829
+
+* Mon Aug 28 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060805-2
+- Rebuild for FE6
+
+* Tue Aug 8 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060805-1
+- new version 2006-08-05
+
+* Mon Jul 31 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060730-1
+- new version 2006-07-30
+
+* Mon Jun 26 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060625-1
+- new version 2006-06-25
+
+* Thu Jun 15 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060608-1
+- new version 2006-06-08
+
+* Sun Jun 4 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060422-1
+- new version 2006-04-22
+
+* Tue Mar 7 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060207-1
+- First Fedora release
+
diff --git a/sources b/sources
index e69de29..8f23b1b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (abcMIDI-2020.06.29.zip) = a53acf12a4360a4ae7e5b0c96084fc7e151e2c7640486824524520e73b12d51cf0c3345aca8d39331e886fb50023db2912575c772dd376db6dd976e3393be55f
https://src.fedoraproject.org/rpms/abcMIDI/c/7895711941baaad7657baa405e15...
3 years, 8 months
sdgathman pushed to abcMIDI (epel8). "Retire abcMIDI."
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 22:45:05 UTC
From 13696b5b3a645e5d21278e5521591998b0eaad6d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting(a)redhat.com>
Date: Feb 23 2011 20:10:26 +0000
Subject: Retire abcMIDI.
---
diff --git a/abcMIDI.spec b/abcMIDI.spec
deleted file mode 100644
index 076540b..0000000
--- a/abcMIDI.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-Name: abcMIDI
-Version: 20090317
-Release: 3%{?dist}
-Summary: ABC to/from MIDI conversion utilities
-
-Group: Applications/Multimedia
-License: GPLv2+
-URL: http://abc.sourceforge.net/abcMIDI
-Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2009-03-17.zip
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-The abcMIDI package contains four programs: abc2midi to convert ABC
-music notation to MIDI, midi2abc to convert MIDI files to (a first
-approximation to) the corresponding ABC, abc2abc to reformat and/or
-transpose ABC files, and yaps to typeset ABC files as PostScript.
-
-For a description of the ABC syntax, please see the ABC userguide
-which is a part of the abcm2ps.
-
-
-%prep
-%setup -q -n abcmidi
-# correct end-of-line encoding
-sed -i 's/\r//' doc/*.txt *.abc doc/AUTHORS VERSION
-# remove executable flag from text files
-chmod 0644 *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
-
-
-%build
-make %{?_smp_mflags} -f makefiles/unix.mak all CFLAGS="-DANSILIBS $RPM_OPT_FLAGS"
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 abc2midi $RPM_BUILD_ROOT%{_bindir}
-install -m 755 abcmatch $RPM_BUILD_ROOT%{_bindir}
-install -m 755 midi2abc $RPM_BUILD_ROOT%{_bindir}
-install -m 755 midicopy $RPM_BUILD_ROOT%{_bindir}
-install -m 755 abc2abc $RPM_BUILD_ROOT%{_bindir}
-install -m 755 mftext $RPM_BUILD_ROOT%{_bindir}
-install -m 755 yaps $RPM_BUILD_ROOT%{_bindir}
-
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/abc2abc.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/abc2midi.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/mftext.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/midi2abc.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/midicopy.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/yaps.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
-%{_mandir}/man*/*
-%{_bindir}/*
-
-
-%changelog
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 20090317-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 20090317-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sat Jun 13 2009 Gerard Milmeister <gemi(a)bluewin.ch> - 20090317-1
-- new release 2009-03-17
-
-* Wed Sep 24 2008 Gerard Milmeister <gemi(a)bluewin.ch> - 20080924-1
-- new release 2008-09-24
-
-* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 20070106-3
-- fix license tag
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 20070106-2
-- Autorebuild for GCC 4.3
-
-* Tue Jan 9 2007 Gerard Milmeister <gemi(a)bluewin.ch> - 20070106-1
-- new version 20070106
-
-* Wed Dec 13 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061211-1
-- new version 20061211
-
-* Mon Nov 6 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061103-1
-- new version 20061103
-
-* Tue Oct 31 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061027-1
-- new version 20061027
-
-* Mon Oct 16 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061015-1
-- new version 20061015
-
-* Mon Oct 9 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20061005-1
-- new version 20061005
-
-* Mon Sep 11 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060910-1
-- new version 20060910
-
-* Wed Aug 30 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060829-1
-- new version 20060829
-
-* Mon Aug 28 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060805-2
-- Rebuild for FE6
-
-* Tue Aug 8 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060805-1
-- new version 2006-08-05
-
-* Mon Jul 31 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060730-1
-- new version 2006-07-30
-
-* Mon Jun 26 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060625-1
-- new version 2006-06-25
-
-* Thu Jun 15 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060608-1
-- new version 2006-06-08
-
-* Sun Jun 4 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060422-1
-- new version 2006-04-22
-
-* Tue Mar 7 2006 Gerard Milmeister <gemi(a)bluewin.ch> - 20060207-1
-- First Fedora release
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..de91ae3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+This package was retired due to no active owner on 2011-02-23
diff --git a/sources b/sources
deleted file mode 100644
index 1c0735e..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-e58ee677884bfc85fd3cd150179966c1 abcMIDI-2009-03-17.zip
https://src.fedoraproject.org/rpms/abcMIDI/c/13696b5b3a645e5d21278e552159...
3 years, 8 months
sdgathman pushed to abcMIDI (epel8). "Release 2020.06.29"
by notifications@fedoraproject.org
Notification time stamped 2020-06-30 22:45:05 UTC
From f6fcbbac2c5fb1fe9b055fa278961a02c404cff8 Mon Sep 17 00:00:00 2001
From: Stuart D. Gathman <stuart(a)gathman.org>
Date: Jun 30 2020 21:11:42 +0000
Subject: Release 2020.06.29
---
diff --git a/.gitignore b/.gitignore
index 4e56fba..9497259 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-abcMIDI-2009-03-17.zip
+abcMIDI-*.zip
diff --git a/abcMIDI.spec b/abcMIDI.spec
index 076540b..f3eac06 100644
--- a/abcMIDI.spec
+++ b/abcMIDI.spec
@@ -1,13 +1,13 @@
Name: abcMIDI
-Version: 20090317
-Release: 3%{?dist}
+Version: 2020.06.29
+Release: 1%{?dist}
Summary: ABC to/from MIDI conversion utilities
Group: Applications/Multimedia
License: GPLv2+
-URL: http://abc.sourceforge.net/abcMIDI
-Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2009-03-17.zip
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: https://ifdo.ca/~seymour/runabc/top.html
+Source0: https://ifdo.ca/~seymour/runabc/%{name}-%{version}.zip
+BuildRequires: gcc dos2unix
%description
The abcMIDI package contains four programs: abc2midi to convert ABC
@@ -18,51 +18,61 @@ transpose ABC files, and yaps to typeset ABC files as PostScript.
For a description of the ABC syntax, please see the ABC userguide
which is a part of the abcm2ps.
+A mirror github repo is at https://github.com/sdgathman/abcmidi
+
%prep
%setup -q -n abcmidi
-# correct end-of-line encoding
-sed -i 's/\r//' doc/*.txt *.abc doc/AUTHORS VERSION
-# remove executable flag from text files
-chmod 0644 *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
-
+find . -type f | xargs dos2unix
+# make license easier to find in files
+mv doc/gpl.txt doc/LICENSE
%build
-make %{?_smp_mflags} -f makefiles/unix.mak all CFLAGS="-DANSILIBS $RPM_OPT_FLAGS"
-
+%configure
+%{make_build}
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 abc2midi $RPM_BUILD_ROOT%{_bindir}
-install -m 755 abcmatch $RPM_BUILD_ROOT%{_bindir}
-install -m 755 midi2abc $RPM_BUILD_ROOT%{_bindir}
-install -m 755 midicopy $RPM_BUILD_ROOT%{_bindir}
-install -m 755 abc2abc $RPM_BUILD_ROOT%{_bindir}
-install -m 755 mftext $RPM_BUILD_ROOT%{_bindir}
-install -m 755 yaps $RPM_BUILD_ROOT%{_bindir}
-
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/abc2abc.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/abc2midi.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/mftext.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/midi2abc.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/midicopy.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 doc/yaps.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 755 abc2midi %{buildroot}%{_bindir}
+install -p -m 755 abcmatch %{buildroot}%{_bindir}
+install -p -m 755 midi2abc %{buildroot}%{_bindir}
+install -p -m 755 midicopy %{buildroot}%{_bindir}
+install -p -m 755 abc2abc %{buildroot}%{_bindir}
+install -p -m 755 mftext %{buildroot}%{_bindir}
+install -p -m 755 yaps %{buildroot}%{_bindir}
+
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/abc2abc.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/abc2midi.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/mftext.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/midi2abc.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/midicopy.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1
%files
-%defattr(-,root,root,-)
-%doc *.abc VERSION doc/*.txt doc/AUTHORS doc/CHANGES
+%license doc/LICENSE
+%doc doc/programming VERSION doc/*.txt doc/AUTHORS doc/CHANGES
%{_mandir}/man*/*
%{_bindir}/*
%changelog
+* Mon Jun 29 2020 Stuart Gathman <stuart(a)gathman.org> - 2020.06.29-1
+- New upstream release
+
+* Tue Jun 02 2020 Stuart Gathman <stuart(a)gathman.org> - 2020.05.06-2
+- Patch some warnings and dup globals
+
+* Mon Jun 01 2020 Stuart Gathman <stuart(a)gathman.org> - 2020.05.06-1
+- New upstream release
+
+* Sun Mar 22 2020 Stuart Gathman <stuart(a)gathman.org> - 2020.02.12-1
+- New release 2020-02-12
+
+* Sun Nov 12 2017 Stuart Gathman <stuart(a)gathman.org> - 2013.04.30-1
+- New release 2013-04-30
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 20090317-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 1c0735e..8f23b1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e58ee677884bfc85fd3cd150179966c1 abcMIDI-2009-03-17.zip
+SHA512 (abcMIDI-2020.06.29.zip) = a53acf12a4360a4ae7e5b0c96084fc7e151e2c7640486824524520e73b12d51cf0c3345aca8d39331e886fb50023db2912575c772dd376db6dd976e3393be55f
https://src.fedoraproject.org/rpms/abcMIDI/c/f6fcbbac2c5fb1fe9b055fa27896...
3 years, 8 months