From 84b275b2a45e60011c35ff5f20536c35f98891eb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Jul 17 2010 06:21:23 +0000 Subject: Ver. 1.2 --- diff --git a/.cvsignore b/.cvsignore index 2173346..9234f0d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -wings-1.0.1.tar.bz2 wings3d_manual1.6.1.pdf +wings-1.2.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..d0d7907 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +wings-1_2-1_fc12:F-13:wings-1.2-1.fc12.src.rpm:1279347649 diff --git a/sources b/sources index 5f1e9a3..57c7b5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ad94cef801e36ca7b3b7175729968fa2 wings-1.0.1.tar.bz2 c01d19b4be79b647b8605dd32753da3a wings3d_manual1.6.1.pdf +817cc8c976d253a9295d34a5ec045768 wings-1.2.tar.bz2 diff --git a/wings.desktop b/wings.desktop new file mode 100644 index 0000000..0284f18 --- /dev/null +++ b/wings.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Wings 3D +Comment=Wings 3D polygon mesh modeler +Exec=wings +Icon=wings.png +Type=Application +Encoding=UTF-8 +X-Desktop-File-Install-Version=0.9 +StartupNotify=true +StartupWMClass=Wings 3D diff --git a/wings.sh b/wings.sh new file mode 100755 index 0000000..e8f5af9 --- /dev/null +++ b/wings.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec erl -smp disable -noinput -run wings_start start_halt ${1+"$@"} diff --git a/wings.spec b/wings.spec index 449c51d..93b102d 100644 --- a/wings.spec +++ b/wings.spec @@ -1,22 +1,38 @@ +%global wingsdir $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{name}-%{version} + Name: wings -Version: 1.0.1 +Version: 1.2 Release: 1%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia License: MIT URL: http://www.wings3d.com -Source0: http://prdownloads.sourceforge.net/wings/wings-%{version}.tar.bz2 +Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf +Source2: wings.sh Source3: wings.png +Source4: wings.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: erlang-esdl-devel + +BuildRequires: erlang +BuildRequires: erlang-esdl BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: desktop-file-utils + Provides: wings-povray = %{version}-%{release} Obsoletes: wings-povray +Requires: erlang-dialyzer +Requires: erlang-erts +Requires: erlang-esdl +Requires: erlang-kernel +Requires: erlang-stdlib +Requires: erlang-tools +Requires: erlang-wx + + %description Wings 3D is a subdivision modeler with an user interface that is easy to use for both beginners and advanced users (inspired by Nendo and @@ -26,7 +42,7 @@ Mirai from Izware). %package docs Group: Applications/Multimedia Summary: Documentation for Wings 3D -Requires: %{name} = %{version}-%{release} + %description docs Documentation for Wings 3D. @@ -36,93 +52,45 @@ Documentation for Wings 3D. %setup -q sed -i 's|-include("sdl_keyboard.hrl").|-include_lib("esdl/include/sdl_keyboard.hrl").|' src/wings_body.erl src/wings_edge_cmd.erl plugins_src/commands/wpc_constraints.erl cp %{SOURCE1} . +cp %{SOURCE2} . +cp %{SOURCE4} . -%define erlangdir %{_libdir}/erlang %build # %%{?_smp_mflags} breaks the build -export ESDL_PATH= -PATH=%{erlangdir}/bin:$PATH make +make %install -%define wingsdir $RPM_BUILD_ROOT%{_libdir}/wings rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p %{wingsdir}/bin - -# copy the wings binaries -mkdir -p %{wingsdir}/lib -mkdir -p %{wingsdir}/lib/wings-%{version} -cp -rf ebin %{wingsdir}/lib/wings-%{version} -cp -rf fonts %{wingsdir}/lib/wings-%{version} -cp -rf textures %{wingsdir}/lib/wings-%{version} -cp -rf shaders %{wingsdir}/lib/wings-%{version} -mkdir -p %{wingsdir}/lib/wings-%{version}/plugins/default -cp -rf plugins/* %{wingsdir}/lib/wings-%{version}/plugins/default -cp -rf fonts %{wingsdir}/lib/wings-%{version} -cp -rf vsn.mk %{wingsdir}/lib/wings-%{version} - -# copy the erlang kernel binaries -cp -rf %{erlangdir}/lib/kernel* %{wingsdir}/lib -rm -rf %{wingsdir}/lib/kernel*/{examples,include,src} +# Install the wings binaries +mkdir -p %{wingsdir}/plugins/default +cp -rf ebin %{wingsdir} +cp -rf fonts %{wingsdir} +cp -rf textures %{wingsdir} +cp -rf shaders %{wingsdir} +cp -rf plugins/* %{wingsdir}/plugins/default +cp -rf fonts %{wingsdir} -# copy the erlang stdlib binaries -cp -rf %{erlangdir}/lib/stdlib* %{wingsdir}/lib -rm -rf %{wingsdir}/lib/stdlib*/{examples,include,src} - -# copy the esdl binaries -cp -rf %{erlangdir}/lib/esdl* %{wingsdir}/lib -rm -rf %{wingsdir}/lib/esdl*/{include,src,vsn} - -# copy erlang binaries and scripts -cp -f %{erlangdir}/erts*/bin/{beam,child_setup,erlexec,inet_gethost} %{wingsdir}/bin -cp -f %{erlangdir}/bin/start.boot %{wingsdir}/bin - - -find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -rf 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 find $RPM_BUILD_ROOT -name '*.fs' | xargs chmod 0644 find $RPM_BUILD_ROOT -name '*.vs' | xargs chmod 0644 -cat > $RPM_BUILD_ROOT%{_bindir}/wings < wings.desktop < - 1.2.0-1 +- Ver. 1.2.0 +- Docs subpackage no longer requires main package + * Tue Aug 11 2009 Gerard Milmeister - 1.0.1-1 - new release 1.0.1