rpms/makehuman/devel makehuman-0.9.1-gcc43.patch, NONE, 1.1 makehuman.spec, 1.1, 1.2 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3
Chauvet (kwizart)
fedora-extras-commits at redhat.com
Fri Jan 4 18:55:06 UTC 2008
Author: kwizart
Update of /cvs/pkgs/rpms/makehuman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19782
Modified Files:
makehuman.spec .cvsignore sources
Added Files:
makehuman-0.9.1-gcc43.patch
Log Message:
- Update to 0.9.1-rc1a
- License is now GPLv3+
- gcc43 fixes
makehuman-0.9.1-gcc43.patch:
--- NEW FILE makehuman-0.9.1-gcc43.patch ---
diff -up makehuman-0.9.1-rc1a/src/BodyPanel.h.gcc43 makehuman-0.9.1-rc1a/src/BodyPanel.h
--- makehuman-0.9.1-rc1a/src/BodyPanel.h.gcc43 2008-01-04 18:33:48.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/BodyPanel.h 2008-01-04 18:40:16.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/Image.h>
#include "util.h"
diff -up makehuman-0.9.1-rc1a/src/UtilitybarPanel.h.gcc43 makehuman-0.9.1-rc1a/src/UtilitybarPanel.h
--- makehuman-0.9.1-rc1a/src/UtilitybarPanel.h.gcc43 2008-01-04 18:49:25.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/UtilitybarPanel.h 2008-01-04 18:49:35.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Image.h>
#include <mhgui/Panel.h>
#include "ImageListener.h"
diff -up makehuman-0.9.1-rc1a/src/FacePanel.h.gcc43 makehuman-0.9.1-rc1a/src/FacePanel.h
--- makehuman-0.9.1-rc1a/src/FacePanel.h.gcc43 2008-01-04 18:44:21.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/FacePanel.h 2008-01-04 18:44:33.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/Image.h>
#include "TargetSelectionListener.h"
diff -up makehuman-0.9.1-rc1a/src/HandsPanel.h.gcc43 makehuman-0.9.1-rc1a/src/HandsPanel.h
--- makehuman-0.9.1-rc1a/src/HandsPanel.h.gcc43 2008-01-04 18:47:27.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/HandsPanel.h 2008-01-04 18:47:35.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/Image.h>
#include "util.h"
diff -up makehuman-0.9.1-rc1a/src/UtilitiesPanel.h.gcc43 makehuman-0.9.1-rc1a/src/UtilitiesPanel.h
--- makehuman-0.9.1-rc1a/src/UtilitiesPanel.h.gcc43 2008-01-04 19:11:07.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/UtilitiesPanel.h 2008-01-04 19:11:25.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/ImageSlider.h>
#include <mhgui/Image.h>
diff -up makehuman-0.9.1-rc1a/src/FileTools.h.gcc43 makehuman-0.9.1-rc1a/src/FileTools.h
--- makehuman-0.9.1-rc1a/src/FileTools.h.gcc43 2008-01-04 19:04:04.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/FileTools.h 2008-01-04 19:08:48.000000000 +0100
@@ -32,7 +32,10 @@
* It works well on Mac OS X (BSD) and Linux */
#ifndef _WIN32
+#include <sys/types.h>
#include <string>
+#include <cstring>
+#include <cstdlib>
#include <list>
#include <cassert>
diff -up makehuman-0.9.1-rc1a/src/CharacterSettingPanel.h.gcc43 makehuman-0.9.1-rc1a/src/CharacterSettingPanel.h
--- makehuman-0.9.1-rc1a/src/CharacterSettingPanel.h.gcc43 2008-01-04 18:57:23.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/CharacterSettingPanel.h 2008-01-04 18:57:42.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/ImageSlider.h>
#include <mhgui/Image.h>
diff -up makehuman-0.9.1-rc1a/src/TeethPanel.h.gcc43 makehuman-0.9.1-rc1a/src/TeethPanel.h
--- makehuman-0.9.1-rc1a/src/TeethPanel.h.gcc43 2008-01-04 18:45:59.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/TeethPanel.h 2008-01-04 18:46:08.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/Image.h>
#include "util.h"
diff -up makehuman-0.9.1-rc1a/src/ToolbarPanel.h.gcc43 makehuman-0.9.1-rc1a/src/ToolbarPanel.h
--- makehuman-0.9.1-rc1a/src/ToolbarPanel.h.gcc43 2008-01-04 18:52:39.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/ToolbarPanel.h 2008-01-04 18:52:47.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/Image.h>
#include "ImageListener.h"
diff -up makehuman-0.9.1-rc1a/src/ClothesPanel.h.gcc43 makehuman-0.9.1-rc1a/src/ClothesPanel.h
--- makehuman-0.9.1-rc1a/src/ClothesPanel.h.gcc43 2008-01-04 19:00:50.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/ClothesPanel.h 2008-01-04 19:00:59.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/Image.h>
#include "util.h"
diff -up makehuman-0.9.1-rc1a/src/PosesBodyPanel.h.gcc43 makehuman-0.9.1-rc1a/src/PosesBodyPanel.h
--- makehuman-0.9.1-rc1a/src/PosesBodyPanel.h.gcc43 2008-01-04 18:54:37.000000000 +0100
+++ makehuman-0.9.1-rc1a/src/PosesBodyPanel.h 2008-01-04 18:54:47.000000000 +0100
@@ -32,6 +32,7 @@
#endif
#include <vector>
+#include <algorithm>
#include <mhgui/Panel.h>
#include <mhgui/Image.h>
#include "util.h"
Index: makehuman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/makehuman/devel/makehuman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- makehuman.spec 26 Sep 2007 08:50:57 -0000 1.1
+++ makehuman.spec 4 Jan 2008 18:54:29 -0000 1.2
@@ -1,15 +1,16 @@
Name: makehuman
-Version: 0.9
-Release: 3%{?dist}
+Version: 0.9.1
+Release: 0.1.rc1a%{?dist}
Summary: Modeling of three-dimensional humanoid characters
Group: Applications/Multimedia
-License: GPLv2+
+License: GPLv3+
URL: http://www.dedalo-3d.com
-Source0: http://downloads.sourceforge.net/makehuman/makehuman-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/makehuman/makehuman-%{version}-rc1a.tar.gz
+Patch0: makehuman-0.9.1-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mhgui-devel
+BuildRequires: mhgui-devel >= 0.2
BuildRequires: desktop-file-utils
@@ -22,14 +23,14 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1a
+%patch0 -p1 -b .gcc43
chmod 0644 src/*
-sed -i.timestamp -e 's|cp -R|cp -pR|g' {data,pixmaps}/Makefile.{am,in}
+sed -i.timestamp -e 's|cp --parents|cp -p --parents|g' {data,pixmaps}/Makefile.{am,in}
%build
%configure --disable-static
-sed -i -e 's|-L/usr/lib|-L%{_libdir}|' Makefile
make %{?_smp_mflags}
@@ -41,7 +42,7 @@
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
# Symlink for pixmap
-ln -s %{name}/ui/mybs.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+ln -s %{name}/bsimg/characters1/bodybuilder_man01.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
cat > %{name}.desktop <<EOF
[Desktop Entry]
@@ -61,11 +62,6 @@
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
%{name}.desktop
-# Remove zero-length files
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_tongue/tongue_camaleon.target
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_teeth/teeth_gengivite.target
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/l_ear2/l_ear_incisura_intertragica_down.target
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_abdomen/abdomen_twist.target
%clean
rm -rf $RPM_BUILD_ROOT
@@ -82,6 +78,11 @@
%changelog
+* Fri Jan 4 2008 kwizart < kwizart at gmail.com > - 0.9.1-0.1.rc1a
+- Update to 0.9.1-rc1a
+- License is now GPLv3+
+- gcc43 fixes
+
* Fri Sep 21 2007 kwizart < kwizart at gmail.com > - 0.9-3
- Add pixmap for .desktop
- Remove Category Application
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/makehuman/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 26 Sep 2007 08:50:57 -0000 1.2
+++ .cvsignore 4 Jan 2008 18:54:29 -0000 1.3
@@ -1 +1 @@
-makehuman-0.9.tar.gz
+makehuman-0.9.1-rc1a.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/makehuman/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 26 Sep 2007 08:50:57 -0000 1.2
+++ sources 4 Jan 2008 18:54:29 -0000 1.3
@@ -1 +1 @@
-c544e01b253fe20916bbd632b3c47b35 makehuman-0.9.tar.gz
+c28c24a5e430f471f9687e26db94a64b makehuman-0.9.1-rc1a.tar.gz
More information about the fedora-extras-commits
mailing list