rpms/hosts3d/devel hosts3d-1.00-libGLU.patch, NONE, 1.1 hosts3d.spec, 1.9, 1.10

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/hosts3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30930

Modified Files:
	hosts3d.spec 
Added Files:
	hosts3d-1.00-libGLU.patch 
Log Message:
* Sun Jul 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.00-3
- FTBFS hosts3d-0.98-1.fc11 (#511623)


hosts3d-1.00-libGLU.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hosts3d-1.00-libGLU.patch ---
diff -up hosts3d-1.00/src/Makefile.am.glu hosts3d-1.00/src/Makefile.am
--- hosts3d-1.00/src/Makefile.am.glu	2009-01-05 00:25:44.000000000 -0600
+++ hosts3d-1.00/src/Makefile.am	2009-07-26 15:00:09.249116298 -0500
@@ -4,4 +4,4 @@ hsen_SOURCES=llist.cpp misc.cpp proto.cp
 hsen_LDADD=-lpcap
 bin_PROGRAMS=hosts3d
 hosts3d_SOURCES=llist.cpp misc.cpp glwin.cpp objects.cpp hosts3d.cpp
-hosts3d_LDADD=-lpthread -lglut
+hosts3d_LDADD=-lpthread -lglut -lGLU
diff -up hosts3d-1.00/src/Makefile.in.glu hosts3d-1.00/src/Makefile.in
--- hosts3d-1.00/src/Makefile.in.glu	2009-06-20 00:56:50.000000000 -0500
+++ hosts3d-1.00/src/Makefile.in	2009-07-26 15:00:16.418365692 -0500
@@ -160,7 +160,7 @@ AUTOMAKE_OPTIONS = no-dependencies
 hsen_SOURCES = llist.cpp misc.cpp proto.cpp hsen.cpp
 hsen_LDADD = -lpcap
 hosts3d_SOURCES = llist.cpp misc.cpp glwin.cpp objects.cpp hosts3d.cpp
-hosts3d_LDADD = -lpthread -lglut
+hosts3d_LDADD = -lpthread -lglut -lGLU
 all: all-am
 
 .SUFFIXES:


Index: hosts3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/devel/hosts3d.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- hosts3d.spec	25 Jul 2009 02:11:47 -0000	1.9
+++ hosts3d.spec	26 Jul 2009 20:05:53 -0000	1.10
@@ -1,6 +1,6 @@
 Name:            hosts3d
 Version:         1.00
-Release:         2%{?dist}
+Release:         3%{?dist}
 Summary:         3D real-time network visualiser
 
 Group:           Applications/Internet
@@ -11,7 +11,10 @@ Source1:         %{name}.desktop
 Source2:         %{name}.png
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: hosts3d-1.00-libGLU.patch
+
 BuildRequires:   freeglut-devel
+BuildRequires:   libGLU-devel
 BuildRequires:   libpcap-devel
 BuildRequires:   desktop-file-utils
 
@@ -55,6 +58,8 @@ standard query response).
 %prep
 %setup -q
 
+%patch1 -p1 -b .libGLU
+
 
 %build
 %configure
@@ -67,9 +72,7 @@ make install INSTALL="install -p" DESTDI
 
 desktop-file-install \
        %{SOURCE1} \
-       %if 0%{?rhel}
-       --vendor="" \
-       %endif
+       %{?rhel:--vendor=""} \
        --dir=%{buildroot}%{_datadir}/applications 
 
 install -Dpm 0644 %{SOURCE2} \
@@ -96,6 +99,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jul 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.00-3
+- FTBFS hosts3d-0.98-1.fc11 (#511623)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild