From bf952782137f0053731bec6faf65f19c134fd55e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mar 22 2013 08:44:52 +0000 Subject: Fixes for #698630 and #664148 - Added localizations (closes rhbz #698630). - Added requires on Erlang driver's API version - Remove user_defaults.beam file from distribution (see rhbz #664148). Signed-off-by: Peter Lemenkov --- diff --git a/wings-0001-No-Erlang-OpenCL-support-for-now.patch b/wings-0001-No-Erlang-OpenCL-support-for-now.patch index 6da8cd1..9bac790 100644 --- a/wings-0001-No-Erlang-OpenCL-support-for-now.patch +++ b/wings-0001-No-Erlang-OpenCL-support-for-now.patch @@ -1,7 +1,7 @@ From 5dec5d2abe1ed4b699769c5eb44547a950ff8b1f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 10 May 2012 23:52:56 +0400 -Subject: [PATCH 1/4] No Erlang OpenCL support for now +Subject: [PATCH 1/6] No Erlang OpenCL support for now Signed-off-by: Peter Lemenkov --- diff --git a/wings-0002-No-such-function-lists-delete_nth-2.patch b/wings-0002-No-such-function-lists-delete_nth-2.patch index 7b106e7..d59d682 100644 --- a/wings-0002-No-such-function-lists-delete_nth-2.patch +++ b/wings-0002-No-such-function-lists-delete_nth-2.patch @@ -1,7 +1,7 @@ From 6fac61a3471e4b29e1a052bdc8783c97105371c5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 11 May 2012 16:56:22 +0400 -Subject: [PATCH 2/4] No such function - lists:delete_nth/2 +Subject: [PATCH 2/6] No such function - lists:delete_nth/2 Signed-off-by: Peter Lemenkov --- diff --git a/wings-0003-Fix-SDL-includes.patch b/wings-0003-Fix-SDL-includes.patch index 899e2ea..d843e4b 100644 --- a/wings-0003-Fix-SDL-includes.patch +++ b/wings-0003-Fix-SDL-includes.patch @@ -1,7 +1,7 @@ From 1831e9ada8932f99651ec9b6730d47e4d42fd5d3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 15 Mar 2013 18:49:10 +0400 -Subject: [PATCH 3/4] Fix SDL includes +Subject: [PATCH 3/6] Fix SDL includes Signed-off-by: Peter Lemenkov --- diff --git a/wings-0004-Simplify-font-handling-and-stop-using-parameterized-.patch b/wings-0004-Simplify-font-handling-and-stop-using-parameterized-.patch index 29bfe95..38afb54 100644 --- a/wings-0004-Simplify-font-handling-and-stop-using-parameterized-.patch +++ b/wings-0004-Simplify-font-handling-and-stop-using-parameterized-.patch @@ -1,7 +1,7 @@ From b6d26111ee16d57559c5ea33b0815a02c371ec0c Mon Sep 17 00:00:00 2001 From: Bjorn Gustavsson Date: Mon, 7 Jan 2013 20:22:34 +0100 -Subject: [PATCH 4/4] Simplify font handling and stop using parameterized +Subject: [PATCH 4/6] Simplify font handling and stop using parameterized modules The wings__font.erl module uses the experimental feature diff --git a/wings-0005-Don-t-try-to-build-installer.patch b/wings-0005-Don-t-try-to-build-installer.patch new file mode 100644 index 0000000..7e39016 --- /dev/null +++ b/wings-0005-Don-t-try-to-build-installer.patch @@ -0,0 +1,25 @@ +From 6c3ab1b2f3cc71b9bf54bff1a3ae5083e766d2c4 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 21 Mar 2013 18:45:25 +0400 +Subject: [PATCH 5/6] Don't try to build installer + +Signed-off-by: Peter Lemenkov +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 713ef4e..017a43a 100644 +--- a/Makefile ++++ b/Makefile +@@ -75,7 +75,6 @@ macosx: all lang + unix: all lang + (cd plugins_src/jpeg; $(MAKE)) + (cd plugins_src/jpeg; $(MAKE) lang) +- unix/make_installer + + # + # Build the source distribution. +-- +1.8.1.4 + diff --git a/wings-0006-Respect-CFLAGS.patch b/wings-0006-Respect-CFLAGS.patch new file mode 100644 index 0000000..55b6add --- /dev/null +++ b/wings-0006-Respect-CFLAGS.patch @@ -0,0 +1,59 @@ +From 438bbf8c8f5b73b145972d06672edebf7bbc2174 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 21 Mar 2013 18:53:10 +0400 +Subject: [PATCH 6/6] Respect CFLAGS + +Signed-off-by: Peter Lemenkov +--- + plugins_src/accel/Makefile | 6 ++---- + plugins_src/jpeg/Makefile | 3 +-- + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/plugins_src/accel/Makefile b/plugins_src/accel/Makefile +index 17eedb0..14de88f 100644 +--- a/plugins_src/accel/Makefile ++++ b/plugins_src/accel/Makefile +@@ -28,7 +28,6 @@ BEAM = $(LIBDIR)/wpc_pnoise.beam \ + $(LIBDIR)/pnoise.beam \ + $(LIBDIR)/wpc_pick.beam + +-COMMON_CFLAGS = -Wall -O3 + + ifdef USEMINGWGCC + SO_EXT = dll +@@ -45,8 +44,7 @@ else + GL_LIBS = + else + LIBS = -shared -fpic +- GL_LIBS = -L/usr/local/lib -lGLU -lGL +- CFLAGS = $(COMMON_CFLAGS) ++ GL_LIBS = -lGLU -lGL + endif + endif + +@@ -66,7 +64,7 @@ $(LIBDIR)/%.beam: %.erl + + $(LIBDIR)/%.$(SO_EXT): %.c + install -d $(LIBDIR) +- $(GCC) $(COMMON_CFLAGS) -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS) ++ $(GCC) $(CFLAGS) -fPIC -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS) + + clean: + rm -f $(TARGET_FILES) +diff --git a/plugins_src/jpeg/Makefile b/plugins_src/jpeg/Makefile +index 9fdc29f..85f5cf4 100644 +--- a/plugins_src/jpeg/Makefile ++++ b/plugins_src/jpeg/Makefile +@@ -66,8 +66,7 @@ else + + $(LIBDIR)/wings_jpeg_image_drv.so: wings_jpeg_image_drv.c + install -d $(LIBDIR) +- gcc -fPIC -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) \ +- -I/usr/local/include -L/usr/local/lib \ ++ gcc $(CFLAGS) -fPIC -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) \ + wings_jpeg_image_drv.c $(LIBS) -ljpeg + + endif +-- +1.8.1.4 + diff --git a/wings.spec b/wings.spec index c0a1c7c..ce86bc0 100644 --- a/wings.spec +++ b/wings.spec @@ -2,14 +2,21 @@ %global upstream dgud %global git_tag 9a2473e %global patchnumber 0 +%{?filter_setup: +%filter_provides_in %{_libdir}/erlang/lib/.*\.so$ +%filter_setup +} +%{expand: %(NIF_VER=`rpm -q erlang-erts --provides | grep --color=no erl_nif_version` ; if [ "$NIF_VER" != "" ]; then echo %%global __erlang_nif_version $NIF_VER ; fi)} +%{expand: %(DRV_VER=`rpm -q erlang-erts --provides | grep --color=no erl_drv_version` ; if [ "$DRV_VER" != "" ]; then echo %%global __erlang_drv_version $DRV_VER ; fi)} %global wingsdir $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{name}-%{version} +%global esdldir `%{_libdir}/erlang/bin/erl -noshell -eval 'io:format("~s", [code:lib_dir(esdl)]), halt().'` Name: wings Version: 1.4.1 -Release: 4.git%{git_tag}%{?dist} +Release: 5.git%{git_tag}%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -30,6 +37,10 @@ Patch2: wings-0002-No-such-function-lists-delete_nth-2.patch Patch3: wings-0003-Fix-SDL-includes.patch # backported from upstream Patch4: wings-0004-Simplify-font-handling-and-stop-using-parameterized-.patch +# Fedora/EPEL specific patch +Patch5: wings-0005-Don-t-try-to-build-installer.patch +# Fedora/EPEL specific patch +Patch6: wings-0006-Respect-CFLAGS.patch BuildRequires: erlang BuildRequires: erlang-esdl BuildRequires: libGL-devel @@ -47,6 +58,7 @@ Requires: erlang-kernel%{?_isa} Requires: erlang-stdlib%{?_isa} Requires: erlang-tools%{?_isa} Requires: erlang-wx%{?_isa} +%{?__erlang_drv_version:Requires: %{__erlang_drv_version}} %description @@ -74,13 +86,15 @@ sed -i -e "s,%LIBDIR%,%{_libdir},g" wings.sh %patch2 -p1 -b .no_lists_delete_nth %patch3 -p1 -b .fix_SDL_includes %patch4 -p1 -b .R16B +%patch5 -p1 -b .no_installer +%patch6 -p1 -b .respect_cflags # Add version info echo %{version}.git%{git_tag} > ./version %build # %%{?_smp_mflags} breaks the build -make +CFLAGS="%{optflags}" ESDL_PATH="%{esdldir}" make unix %install @@ -94,6 +108,9 @@ cp -rf plugins/* %{wingsdir}/plugins/default cp -rf fonts %{wingsdir} cp intl_tools/tools.beam %{wingsdir}/ebin +# see - https://bugzilla.redhat.com/664148 +rm -f %{wingsdir}/ebin/user_defaults.beam + find $RPM_BUILD_ROOT -name 'README' | xargs rm -f find $RPM_BUILD_ROOT -name '*.txt' | xargs chmod 0644 find $RPM_BUILD_ROOT -name '*.auv' | xargs chmod 0644 @@ -126,6 +143,11 @@ desktop-file-install \ %changelog +* Fri Mar 22 2013 Peter Lemenkov - 1.4.1-5.git9a2473e +- Added localizations (closes rhbz #698630). +- Added requires on Erlang driver's API version +- Remove user_defaults.beam file from distribution (see rhbz #664148). + * Fri Mar 15 2013 Peter Lemenkov - 1.4.1-4.git9a2473e - Fixed missing function - Cleaned up spec-file