- -lpng fix from altlinux

Changed files:
    earth3d.spec -> 1.5
    libs.patch -> 1.1

diff --git a/earth3d.spec b/earth3d.spec
index be9f95313b8bda0d4f874388eee1f083916c1bd6..524fb6d7bebd3dfe21f1d044834f4ae814339b2d 100644 (file)
--- a/earth3d.spec
+++ b/earth3d.spec
@@ -8,6 +8,7 @@ Source0:        http://downloads.sourceforge.net/earth3d/%{name}_client-%{version}-src.
 # Source0-md5: d273437a473f66401b01acf7521808c3
 Patch0:                gcc.patch
 Patch1:                libpng.patch
+Patch2:                libs.patch
 URL:           http://www.earth3d.org/
 BuildRequires: ImageMagick-devel
 BuildRequires: qt-devel
@@ -21,6 +22,7 @@ display recent satellite images and map data.
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 echo "#include <gltest.h>" > gltestwidget.h
 
 %build

diff --git a/libs.patch b/libs.patch
new file mode 100644 (file)
index 0000000..71e95ee
--- /dev/null
+++ b/libs.patch
@@ -0,0 +1,11 @@
+diff -Naur earth3d-orig/earth3d.pro earth3d/earth3d.pro
+--- earth3d-orig/earth3d.pro   2005-10-28 04:06:01 +0300
++++ earth3d/earth3d.pro        2006-03-07 18:05:13 +0200
+@@ -19,6 +19,7 @@
+   OBJECTS_DIR = .obj
+ !mac {
+   DEFINES     += LINUX
++  LIBS += -lpng
+ #  LIBS += -ljsw
+ #  QMAKE_CXXFLAGS_RELEASE += -march=pentium4 -O2 -pipe -fomit-frame-pointer
+ #  QMAKE_CXXFLAGS_RELEASE += -march=athlon-xp -O2 -pipe -fomit-frame-pointer