diff --git a/.gitignore b/.gitignore index ed1230a..1ac3a58 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ wings-1.2.tar.bz2 /wings-2.0.3.tar.gz /wings-2.0.4.tar.gz /wings-2.1.5.tar.gz +/wings-2.1.7.tar.gz diff --git a/sources b/sources index 51b5a14..b93f84e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wings-2.1.5.tar.gz) = daae9ea40b350685045b513e60d290881e8c9dcb27327644451189097cb9d3da51641c4dd4061d1ece71478e335552c49a31b90202326731fd33b39899e0c376 SHA512 (wings3d_manual1.6.1.pdf) = 6b3bcd25b091ff95bf02ac45e4f24a54317732e44592f8116b4745cd908570489f376130368c13289388130d193385dbfa050bff3ab1d174f73c2bc1ef3e705c +SHA512 (wings-2.1.7.tar.gz) = 14dc5db4e49ece8f2ca6e7f1697985be226f8c5db3f79410f8a7f632de3578c2bf736488999b4b5f5810301d32fcb772475b9954f7da69b3e5e87f88cc544831 diff --git a/wings-0001-Respect-CFLAGS.patch b/wings-0001-Respect-CFLAGS.patch index e275739..09887d1 100644 --- a/wings-0001-Respect-CFLAGS.patch +++ b/wings-0001-Respect-CFLAGS.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Respect CFLAGS Signed-off-by: Peter Lemenkov diff --git a/plugins_src/accel/Makefile b/plugins_src/accel/Makefile -index 05d6ddd9..e272e05b 100644 +index 3877264d..2d0b599d 100644 --- a/plugins_src/accel/Makefile +++ b/plugins_src/accel/Makefile -@@ -38,9 +38,6 @@ ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),init:stop().' | erl +@@ -39,9 +39,6 @@ ERL_DIR := $(shell echo $(FRD) | erl | sed -n '/^=:/s/^=://p') ERL_INC = "$(ERL_DIR)/usr/include" BEAM = $(LIBDIR)/wpc_pick.beam @@ -18,7 +18,7 @@ index 05d6ddd9..e272e05b 100644 ifeq ($(UseMCL),true) OUT = -Fe: SO_EXT = dll -@@ -62,8 +59,7 @@ else +@@ -63,8 +60,7 @@ else GL_LIBS = else LIBS = -shared -fpic @@ -28,7 +28,7 @@ index 05d6ddd9..e272e05b 100644 endif endif endif -@@ -87,7 +83,7 @@ $(LIBDIR)/%.beam: %.erl +@@ -88,7 +84,7 @@ $(LIBDIR)/%.beam: %.erl $(LIBDIR)/%.$(SO_EXT): %.c install -d $(LIBDIR) diff --git a/wings-0002-Fix-include-paths.patch b/wings-0002-Fix-include-paths.patch index d2f3784..e0744a8 100644 --- a/wings-0002-Fix-include-paths.patch +++ b/wings-0002-Fix-include-paths.patch @@ -31,7 +31,7 @@ index fb2fd953..352496e9 100644 # ---------------------------------------------------- # Targets diff --git a/plugins_src/autouv/Makefile b/plugins_src/autouv/Makefile -index 27e9ab6e..65474e3c 100644 +index c656ec3a..8e6595e4 100644 --- a/plugins_src/autouv/Makefile +++ b/plugins_src/autouv/Makefile @@ -45,7 +45,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) @@ -57,10 +57,10 @@ index 3b2ac121..7b644836 100644 # ---------------------------------------------------- # Targets diff --git a/plugins_src/import_export/Makefile b/plugins_src/import_export/Makefile -index 031a0287..cfe1f225 100644 +index 84fb72d2..ffc940b6 100644 --- a/plugins_src/import_export/Makefile +++ b/plugins_src/import_export/Makefile -@@ -53,7 +53,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) +@@ -54,7 +54,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) # FLAGS # ---------------------------------------------------- ERL_COMPILE_FLAGS += -Werror \ @@ -83,10 +83,10 @@ index 9b96d825..a9a01963 100644 # ---------------------------------------------------- # Targets diff --git a/src/Makefile b/src/Makefile -index f7af240b..e12dd3ec 100644 +index 94c6e6e9..b3a30116 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -139,7 +139,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.beam) +@@ -148,7 +148,7 @@ APP_TARGET = $(EBIN)/$(APP_FILE) # FLAGS # ---------------------------------------------------- ERL_COMPILE_FLAGS += -Werror -I ../e3d $(TYPE_FLAGS) \ diff --git a/wings-0003-Don-t-assume-we-have-installed-Wings.patch b/wings-0003-Don-t-assume-we-have-installed-Wings.patch index 8e36dd8..be39d01 100644 --- a/wings-0003-Don-t-assume-we-have-installed-Wings.patch +++ b/wings-0003-Don-t-assume-we-have-installed-Wings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't assume we have installed Wings Signed-off-by: Peter Lemenkov diff --git a/tools/release b/tools/release -index 6e9a1edb..a859692d 100755 +index f784d4f3..8f93a614 100755 --- a/tools/release +++ b/tools/release @@ -32,7 +32,11 @@ main(_) -> diff --git a/wings.spec b/wings.spec index cb0365f..90d217b 100644 --- a/wings.spec +++ b/wings.spec @@ -2,8 +2,8 @@ Name: wings -Version: 2.1.5 -Release: 3%{?dist} +Version: 2.1.7 +Release: 1%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -11,7 +11,7 @@ License: MIT URL: http://www.wings3d.com VCS: scm:git:https://github.com/dgud/wings.git Source0: https://github.com/dgud/wings/archive/v%{version}/%{name}-%{version}.tar.gz -Source1: http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf +Source1: https://sourceforge.net/projects/wings/files/manual/1.6.1/wings3d_manual1.6.1.pdf Source3: wings.png Source4: wings.desktop Source5: wings.sh @@ -79,8 +79,6 @@ cp -rf textures %{wingsdir} cp intl_tools/tools.beam %{wingsdir}/ebin # See - https://bugzilla.redhat.com/664148 -# ./src/wings_toolbar.erl:227 -# ./src/wings_toolbar.erl:240 rm -f %{wingsdir}/ebin/user_default.beam find $RPM_BUILD_ROOT -name 'README' | xargs rm -f @@ -118,6 +116,9 @@ install -D -p -m 0644 unix/wings.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/ %changelog +* Tue Nov 20 2018 Peter Lemenkov - 2.1.7-1 +- Ver. 2.1.7 + * Sat Jul 14 2018 Fedora Release Engineering - 2.1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild