rpms/wings/F-12 import.log, NONE, 1.1 wings.desktop, NONE, 1.1 wings.sh, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wings.spec, 1.14, 1.15
Peter Lemenkov
peter at fedoraproject.org
Sat Jul 17 06:25:50 UTC 2010
Author: peter
Update of /cvs/pkgs/rpms/wings/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3447/F-12
Modified Files:
.cvsignore sources wings.spec
Added Files:
import.log wings.desktop wings.sh
Log Message:
Ver. 1.2
--- NEW FILE import.log ---
wings-1_2-1_fc12:F-12:wings-1.2-1.fc12.src.rpm:1279347777
--- NEW FILE wings.desktop ---
[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
--- NEW FILE wings.sh ---
#!/bin/sh
exec erl -smp disable -noinput -run wings_start start_halt ${1+"$@"}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wings/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 20 Aug 2009 16:58:29 -0000 1.6
+++ .cvsignore 17 Jul 2010 06:25:49 -0000 1.7
@@ -1,2 +1,2 @@
-wings-1.0.1.tar.bz2
wings3d_manual1.6.1.pdf
+wings-1.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wings/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 20 Aug 2009 16:58:29 -0000 1.6
+++ sources 17 Jul 2010 06:25:50 -0000 1.7
@@ -1,2 +1,2 @@
-ad94cef801e36ca7b3b7175729968fa2 wings-1.0.1.tar.bz2
c01d19b4be79b647b8605dd32753da3a wings3d_manual1.6.1.pdf
+817cc8c976d253a9295d34a5ec045768 wings-1.2.tar.bz2
Index: wings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wings/F-12/wings.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- wings.spec 20 Aug 2009 16:58:29 -0000 1.14
+++ wings.spec 17 Jul 2010 06:25:50 -0000 1.15
@@ -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
+# 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 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}
-
-# 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 <<EOF
-#!/bin/sh
-ROOTDIR=%{_libdir}/wings
-BINDIR=\$ROOTDIR/bin
-EMU=beam
-PROGNAME=wings
-export ROOTDIR
-export BINDIR
-export EMU
-export PROGNAME
-exec \$BINDIR/erlexec -smpdisable -noinput -run wings_start start_halt \$*
-EOF
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/wings
-
-cat > wings.desktop <<EOF
-[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
-EOF
+# Install main startup script
+install -D -p -m 0755 wings.sh $RPM_BUILD_ROOT%{_bindir}/wings
+
+# Install icon
+install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/wings.png
+# Install desktop entry
desktop-file-install --vendor fedora \
--add-category Graphics \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
wings.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -131,10 +99,10 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/wings
-%{_libdir}/wings
+%{_libdir}/erlang/lib/%{name}-%{version}
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
-%doc README license.terms AUTHORS
+%doc AUTHORS NOTES-1.0 NOTES-1.1 NOTES-1.2 OLD-NOTES README license.terms
%files docs
@@ -143,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jul 12 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.2.0-1
+- Ver. 1.2.0
+- Docs subpackage no longer requires main package
+
* Tue Aug 11 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.1-1
- new release 1.0.1
More information about the scm-commits
mailing list