rpms/libglpng/F-10 libglpng-1.45-debian.patch, NONE, 1.1 libglpng-1.45-makefile, NONE, 1.1 libglpng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/libglpng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3314

Modified Files:
	.cvsignore sources 
Added Files:
	libglpng-1.45-debian.patch libglpng-1.45-makefile 
	libglpng.spec 
Log Message:
* Sun May 17 2009 Hans de Goede <hdegoede at redhat.com> 1.45-1
- Initial Fedora package, based on Mandriva package


libglpng-1.45-debian.patch:

--- NEW FILE libglpng-1.45-debian.patch ---
diff -up libglpng-1.45.orig libglpng-1.45
diff -up libglpng-1.45.orig/src/glpng.c.orig libglpng-1.45.orig/src/glpng.c
--- libglpng-1.45.orig/src/glpng.c.orig	2000-07-10 21:27:10.000000000 +0200
+++ libglpng-1.45.orig/src/glpng.c	2009-05-17 23:02:38.000000000 +0200
@@ -29,7 +29,7 @@
 #include <GL/gl.h>
 #include <stdlib.h>
 #include <math.h>
-#include "png/png.h"
+#include <png.h>
 
 /* Used to decide if GL/gl.h supports the paletted extension */
 #ifdef GL_COLOR_INDEX1_EXT
@@ -113,6 +113,7 @@ static void Resize(int components, const
 	}
 }
 
+#ifdef _WIN32
 static int ExtSupported(const char *x) {
 	static const GLubyte *ext = NULL;
 	const char *c;
@@ -129,6 +130,7 @@ static int ExtSupported(const char *x) {
 
 	return 0;
 }
+#endif
 
 #define GET(o) ((int)*(data + (o)))
 


--- NEW FILE libglpng-1.45-makefile ---
LDFLAGS=-lpng -lGL
SHAREDLIBFLAGS=-shared
DESTDIR=/usr/local
LIB=lib

all: libglpng.a libglpng.so.1.45

libglpng.a: glpng.o
	ar rv $@ $<

libglpng.so.1.45: glpng.o
	gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@

glpng.o: src/glpng.c
	gcc $(CFLAGS) -c $<

clean:
	rm glpng.o libglpng.*

install:
	for i in include include/GL $(LIB); do \
		install -m 755 -d $(DESTDIR)/$$i; \
	done
	install -p -m 644 include/GL/glpng.h $(DESTDIR)/include/GL
	install -m 755 libglpng.* $(DESTDIR)/$(LIB)
	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1
	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so

.PHONY: clean install


--- NEW FILE libglpng.spec ---
Name:           libglpng
Version:        1.45
Release:        1%{?dist}
Summary:        Toolkit for loading PNG images as OpenGL textures
Group:          System Environment/Libraries
License:        MIT
URL:            https://admin.fedoraproject.org/pkgdb/packages/name/libglpng
# Upstream's dead
Source0:        http://ftp.de.debian.org/debian/pool/main/libg/%{name}/%{name}_%{version}.orig.tar.gz
# From Debian - a Makefile. Yay.
Source1:        libglpng-1.45-makefile
# Debian patch, couple of small fixes.
Patch0:         libglpng-1.45-debian.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libpng-devel libGL-devel

%description
glpng is a small toolkit to make loading PNG image files as an OpenGL
texture as easy as possible.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n %{name}-%{version}.orig
%patch0 -p1
cp %{SOURCE1} Makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -Iinclude" libglpng.so.1.45


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT%{_prefix} LIB=%{_lib}


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc glpng.htm
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/GL
%{_libdir}/%{name}.so


%changelog
* Sun May 17 2009 Hans de Goede <hdegoede at redhat.com> 1.45-1
- Initial Fedora package, based on Mandriva package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libglpng/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 May 2009 05:43:35 -0000	1.1
+++ .cvsignore	23 May 2009 15:15:58 -0000	1.2
@@ -0,0 +1 @@
+libglpng_1.45.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libglpng/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 May 2009 05:43:35 -0000	1.1
+++ sources	23 May 2009 15:16:00 -0000	1.2
@@ -0,0 +1 @@
+9e0daad8e39fbf3179c73c0d3f74f104  libglpng_1.45.orig.tar.gz