Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openttd-openmsx for openSUSE:Factory
checked in at 2021-04-24 23:08:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openttd-openmsx (Old)
and /work/SRC/openSUSE:Factory/.openttd-openmsx.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openttd-openmsx"
Sat Apr 24 23:08:21 2021 rev:6 rq:887838 version:0.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openttd-openmsx/openttd-openmsx.changes
2012-03-20 11:31:14.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.openttd-openmsx.new.12324/openttd-openmsx.changes
2021-04-24 23:09:40.571439181 +0200
@@ -1,0 +2,11 @@
+Thu Apr 22 10:37:33 UTC 2021 - Jan Engelhardt <[email protected]>
+
+- Trim metadata that was repeated in description.
+
+-------------------------------------------------------------------
+Thu Apr 15 16:54:32 UTC 2021 - Jan Baier <[email protected]>
+
+- upstream update 0.4.0
+- add not yet released patch 0001-openmsx-fix-install-target.patch
+
+-------------------------------------------------------------------
Old:
----
openmsx-0.3.1-source.tar.gz
New:
----
0.4.0.tar.gz
0001-openmsx-fix-install-target.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openttd-openmsx.spec ++++++
--- /var/tmp/diff_new_pack.WgQCm0/_old 2021-04-24 23:09:40.979439759 +0200
+++ /var/tmp/diff_new_pack.WgQCm0/_new 2021-04-24 23:09:40.983439764 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openttd-openmsx
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,52 +12,48 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: openttd-openmsx
-Version: 0.3.1
-Release: 1%{?dist}
+Version: 0.4.0
+Release: 0
Summary: An OpenTTD Music set
-License: GPL-2.0
+License: GPL-2.0-only
Group: Amusements/Games/Strategy/Other
-
-Url: http://dev.openttdcoop.org/projects/openmsx
-Source0:
http://bundles.openttdcoop.org/openmsx/releases/%{version}/openmsx-%{version}-source.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
-
+URL: https://github.com/OpenTTD/OpenMSX
+Source0:
https://github.com/OpenTTD/OpenMSX/archive/refs/tags/%{version}.tar.gz
+Patch0: 0001-openmsx-fix-install-target.patch
BuildRequires: python
Requires: openttd-data >= 1.2
+BuildArch: noarch
%if 0%{?suse_version} || 0%{?mdkversion}
Recommends: timidity
%endif
%description
-OpenMSX is an open source replacement for the original Transport Tycoon Deluxe
(TTD)
-music. All contributions are licensed under the GPL v2.
+OpenMSX is a base music set for OpenTTD.
%prep
-%setup -qn openmsx-%{version}-source
+%setup -q -n OpenMSX-%{version}
+%patch0
%build
-make %{?_smp_mflags} _V=
+%make_build PYTHON=%{_bindir}/python3 REPO_VERSION=%{version} _V=
%install
-%define omsxdir %{_datadir}/openttd/baseset
-make install INSTALL_DIR=%{buildroot}%{omsxdir} _V=
-#openmsx adds a versioned dir to the install dir
+%make_install INSTALL_DIR=%{buildroot}%{_datadir}/openttd/baseset
PYTHON=%{_bindir}/python3 REPO_VERSION=%{version} _V=
+
%define omsxdir %{_datadir}/openttd/baseset/openmsx-%{version}
%files
-%defattr(-,root,root,-)
+%license %{omsxdir}/license.txt
+%doc %{omsxdir}/changelog.txt
+%doc %{omsxdir}/readme.txt
%dir %{_datadir}/openttd
%dir %{_datadir}/openttd/baseset
%dir %{omsxdir}
-%doc %{omsxdir}/changelog.txt
-%doc %{omsxdir}/license.txt
-%doc %{omsxdir}/readme.txt
%{omsxdir}/openmsx.obm
%{omsxdir}/*.mid
++++++ openmsx-0.3.1-source.tar.gz -> 0.4.0.tar.gz ++++++
++++ 2902 lines of diff (skipped)
++++++ 0001-openmsx-fix-install-target.patch ++++++
commit 8c4a1ccba0ea07c03659edc5933d8eab583611c1
Author: Wuzzy <[email protected]>
Date: Wed Apr 7 11:10:15 2021 +0000
Fix: Install location of 'make install' (#20)
diff --git Makefile Makefile
index fd7c013..c650644 100644
--- Makefile
+++ Makefile
@@ -27,7 +27,7 @@ BASE_FILENAME ?= openmsx
# Documentation files
DOC_FILES ?= docs/readme.txt docs/license.txt docs/changelog.txt
-# Possible offset to NewGRF version. Increase by one, if a release
+# Possible offset to baseset version. Increase by one, if a release
# branch is added to the repository
REPO_BRANCH_VERSION ?= 0
@@ -42,11 +42,11 @@ SCRIPT_DIR ?= build-common
# REQUIRED_NML_BRANCH = 0.3
# MIN_NML_REVISION = 0
-##################################################################
+###################################################################
#
-# Everything below here usually need not change for simple NewGRFs
+# Everything below here usually need not change for simple basesets
#
-##################################################################
+###################################################################
# Define the filenames of the grf and nml file. They must be in the main
directoy
GRF_FILE ?= $(BASE_FILENAME).grf
@@ -255,7 +255,7 @@ ifeq ($(NML),)
endif
ifdef REQUIRED_NML_BRANCH
ifneq ($(REQUIRED_NML_BRANCH),$(NML_BRANCH))
- $(_E) "Wrong NML version. This NewGRF requires an NML from the
$(REQUIRED_NML_BRANCH) branch, but $(NML_BRANCH) found."
+ $(_E) "Wrong NML version. This baseset requires an NML from the
$(REQUIRED_NML_BRANCH) branch, but $(NML_BRANCH) found."
$(_V) false
endif
endif
@@ -460,7 +460,7 @@ maintainer-clean::
$(_E) "[MAINTAINER-CLEAN BUNDLE SRC]"
$(_V) -rm -rf $(MD5_SRC_FILENAME)
-# target 'install' which installs the grf
+# target 'install' which installs the baseset
################################################################
# Install targets
################################################################
@@ -477,7 +477,7 @@ OSTYPE:=$(shell uname -s)
# Check for OSX
ifeq ($(OSTYPE),Darwin)
-INSTALL_DIR :=$(HOME)/Documents/OpenTTD/newgrf/$(BASE_FILENAME)
+INSTALL_DIR :=$(HOME)/Documents/OpenTTD/baseset/$(BASE_FILENAME)
endif
# Check for Windows / MinGW32
@@ -488,20 +488,20 @@ ifeq "$(origin CC)" "default"
endif
WIN_VER = $(shell echo "$(OSTYPE)" | cut -d- -f2 | cut -d. -f1)
ifeq ($(WIN_VER),5)
- INSTALL_DIR :=C:\Documents and Settings\All Users\Shared
Documents\OpenTTD\newgrf\$(BASE_FILENAME)
+ INSTALL_DIR :=C:\Documents and Settings\All Users\Shared
Documents\OpenTTD\baseset\$(BASE_FILENAME)
else
- INSTALL_DIR :=C:\Users\Public\Documents\OpenTTD\newgrf\$(BASE_FILENAME)
+ INSTALL_DIR :=C:\Users\Public\Documents\OpenTTD\baseset\$(BASE_FILENAME)
endif
endif
# Check for Windows / Cygwin
ifeq ($(shell echo "$(OSTYPE)" | cut -d_ -f1),CYGWIN)
-INSTALL_DIR :=$(shell cygpath -A -O)/OpenTTD/newgrf/$(BASE_FILENAME)
+INSTALL_DIR :=$(shell cygpath -A -O)/OpenTTD/baseset/$(BASE_FILENAME)
endif
# If non of the above matched, we'll assume we're on a unix-like system
ifeq ($(OSTYPE),Linux)
-INSTALL_DIR := $(HOME)/.openttd/newgrf/$(BASE_FILENAME)
+INSTALL_DIR := $(HOME)/.openttd/baseset/$(BASE_FILENAME)
endif
endif
@@ -513,15 +513,15 @@ ifeq ($(INSTALL_DIR),"")
$(_V) false
endif
$(_E) "[INSTALL] to $(INSTALL_DIR)"
- $(_V) install -d $(INSTALL_DIR)
- $(_V) install -m644 $< $(INSTALL_DIR)
+ $(_V) install -d $(INSTALL_DIR)/$(DIR_NAME)
+ $(_V) install -m644 $(DIR_NAME)/* $(INSTALL_DIR)/$(DIR_NAME)
# misc. convenience targets like 'langcheck'
-include $(SCRIPT_DIR)/Makefile_misc
help:
- $(_E) "all: Build the entire NewGRF and its documentation"
- $(_E) "install: Install into the default NewGRF directory
($(INSTALL_DIR))"
+ $(_E) "all: Build the entire baseset and its documentation"
+ $(_E) "install: Install into the default baseset directory
($(INSTALL_DIR))"
$(_E) "$(GENERATE_DOC): Build the documentation ($(DOC_FILES))"
ifdef GFX_SCRIPT_LIST_FILES
$(_E) "$(GENERATE_GFX): Build the graphics dependencies"
@@ -575,5 +575,5 @@ endif
$(_E) "XZ XZ_FLAGS defaults: $(XZ) $(XZ_FLAGS)"
$(_E)
$(_E) "INSTALL_DIR defaults: $(INSTALL_DIR)"
- $(_E) " Sets the default installation directory for NewGRFs"
+ $(_E) " Sets the default installation directory for basesets"
