From badac4db4b727706d8e2c1d62f4d3d5cec827052 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: May 11 2016 15:17:07 +0000 Subject: Ver. 2.0.4 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index c218377..903f3d4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ wings-1.2.tar.bz2 /wings-1.5.3.tar.gz /wings-2.0.2.tar.gz /wings-2.0.3.tar.gz +/wings-2.0.4.tar.gz diff --git a/sources b/sources index c4d981e..a01fc0e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -246bb7989d9701258e3c9af66b3d31eb wings-2.0.3.tar.gz +f47d9dfd76ca9cfeaa222cfeee815a19 wings-2.0.4.tar.gz c01d19b4be79b647b8605dd32753da3a wings3d_manual1.6.1.pdf diff --git a/wings.desktop b/wings.desktop index 0284f18..30718ed 100644 --- a/wings.desktop +++ b/wings.desktop @@ -2,9 +2,8 @@ Name=Wings 3D Comment=Wings 3D polygon mesh modeler Exec=wings -Icon=wings.png +Icon=wings 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..a5bc73b --- /dev/null +++ b/wings.sh @@ -0,0 +1,2 @@ +#!/bin/bash +exec /usr/bin/erl -smp disable -noinput -run wings_start start_halt ${1+"$@"} diff --git a/wings.spec b/wings.spec index 93219e0..fd8c016 100644 --- a/wings.spec +++ b/wings.spec @@ -1,13 +1,8 @@ -%{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 `/usr/bin/erl -noshell -eval 'io:format("~s", [code:lib_dir(esdl)]), halt().'` Name: wings -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: 3D Subdivision Modeler @@ -19,6 +14,7 @@ Source0: https://github.com/dgud/wings/archive/v%{version}/%{name}-%{version}.ta Source1: http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf Source3: wings.png Source4: wings.desktop +Source5: wings.sh # Fedora/EPEL specific patch Patch1: wings-0001-Respect-CFLAGS.patch # Adjust include paths @@ -29,7 +25,7 @@ Patch3: wings-0003-Don-t-assume-we-have-installed-Wings.patch Patch4: wings-0004-Don-t-build-release.patch BuildRequires: erlang BuildRequires: erlang-cl -BuildRequires: erlang-esdl +BuildRequires: erlang-rpm-macros BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: desktop-file-utils @@ -37,12 +33,6 @@ BuildRequires: desktop-file-utils Provides: wings-povray = %{version}-%{release} Obsoletes: wings-povray -Requires: erlang-cl%{?_isa} -Requires: erlang-erts%{?_isa} >= 18.0.0 -Requires: erlang-esdl%{?_isa} -Requires: erlang-kernel%{?_isa} -Requires: erlang-stdlib%{?_isa} -Requires: erlang-wx%{?_isa} %{?__erlang_drv_version:Requires: %{__erlang_drv_version}} @@ -63,12 +53,8 @@ Documentation for Wings 3D. %prep %setup -q -echo "#!/bin/bash -exec /usr/bin/erl -smp disable -noinput -pa %{esdldir}/ebin -run wings_start start_halt \${1+\"\$@\"}" > ./wings.sh -chmod 755 ./wings.sh cp %{SOURCE1} . cp %{SOURCE4} . -sed -i -e "s,%LIBDIR%,%{_libdir},g" wings.sh %patch1 -p1 -b .respect_cflags %patch2 -p1 -b .fix_includes %patch3 -p1 -b .fresh @@ -79,7 +65,7 @@ echo %{version} > ./version %build # %%{?_smp_mflags} breaks the build -CFLAGS="%{optflags}" ESDL_PATH="%{esdldir}" make unix +CFLAGS="%{optflags}" make unix %install @@ -104,7 +90,7 @@ find $RPM_BUILD_ROOT -name '*.fs' | xargs chmod 0644 find $RPM_BUILD_ROOT -name '*.vs' | xargs chmod 0644 # Install main startup script -install -D -p -m 0755 wings.sh $RPM_BUILD_ROOT%{_bindir}/wings +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/wings # Install icon install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/wings.png @@ -116,52 +102,12 @@ desktop-file-install \ wings.desktop # Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - wings.desktop - CC0-1.0 - An advanced subdivision modeler - -

- Wings 3D is an advanced subdivision modeler that is both powerful and easy to use. - Wings has a simple interface. - Right-click menus give you easy access to common commands. - These menus are context sensitive, so depending on your selection, a - different menu pops up. -

-

- Wings has a many standard mesh modeling and selection tools such as Move, - Scale, Rotate, Extrude, Bevel, Bridge, Cut, and Weld. - Wings also features advance modelling tools such as: Sweep, Plane Cut, - Circularise, Intersect, Bend, Shear, and Inset, Magnets and Magnet Masking, - Virtual Mirror for symmetrical modeling, Tweak and Sculpt, Edge Loop and - Edge Ring selection and navigation tools and Smooth Preview. -

- - http://www.wings3d.com - - http://www.wings3d.com/wp-content/uploads/SS04.png - - -EOF +install -D -p -m 0644 unix/wings.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml %files %{_bindir}/wings %{_libdir}/erlang/lib/%{name}-%{version} -%{_datadir}/appdata/*.appdata.xml +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/* %{_datadir}/pixmaps/* %doc AUTHORS OLD-NOTES README README-20.txt README.jp @@ -172,6 +118,9 @@ EOF %changelog +* Wed May 11 2016 Peter Lemenkov - 2.0.4-1 +- Ver. 2.0.4 + * Sat Apr 16 2016 Peter Lemenkov - 2.0.3-1 - Ver. 2.0.3