rpms/libglfw/F-10 glfw-makefiles.patch, NONE, 1.1 glfw.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/libglfw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21157/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	glfw-makefiles.patch glfw.spec import.log 
Log Message:

Initial import


glfw-makefiles.patch:

--- NEW FILE glfw-makefiles.patch ---
--- glfw/compile.sh	2008-10-03 14:30:04.000000000 +0100
+++ glfw/compile-new.sh	2008-10-03 14:32:19.000000000 +0100
@@ -594,7 +594,7 @@
 cat > "$MKNAME" <<EOF
 prefix=@PREFIX@
 exec_prefix=@PREFIX@
-libdir=@PREFIX@/lib
+libdir=@lib@
 includedir=@PREFIX@/include
 
 Name: GLFW

--- glfw/lib/x11/Makefile.x11.in	2007-07-01 10:46:46.000000000 +0100
+++ glfw/lib/x11/Makefile.x11-new.in	2008-10-03 14:39:32.000000000 +0100
@@ -25,12 +25,12 @@
 # Install GLFW static library
 ##########################################################################
 install: libglfw.a libglfw.pc
-	$(INSTALL) -d $(PREFIX)/lib
-	$(INSTALL) -c -m 644 libglfw.a $(PREFIX)/lib/libglfw.a
-	$(INSTALL) -d $(PREFIX)/include/GL
-	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(PREFIX)/include/GL/glfw.h
-	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
-	$(INSTALL) -c -m 644 libglfw.pc $(PREFIX)/lib/pkgconfig/libglfw.pc
+	$(INSTALL) -d @libdir@
+	$(INSTALL) -c -m 644 libglfw.a @libdir@/libglfw.a
+	$(INSTALL) -d @br@/$(PREFIX)/include/GL
+	$(INSTALL) -c -m 644 ../../include/GL/glfw.h @br@/$(PREFIX)/include/GL/glfw.h
+	$(INSTALL) -d @libdir@/pkgconfig
+	$(INSTALL) -c -m 644 libglfw.pc @libdir@/pkgconfig/libglfw.pc
 
 
 ##########################################################################
--- glfw/compile.sh	2008-10-04 23:00:45.000000000 +0100
+++ glfw/compile-new.sh	2008-10-04 23:01:52.000000000 +0100
@@ -63,7 +63,7 @@
   CC=cc
 fi
 
-CFLAGS=
+CFLAGS="$CFLAGS"
 LFLAGS=
 LDFLAGS=
 INCS=


--- NEW FILE glfw.spec ---
Name:           libglfw
Version:        2.6
Release:        2%{?dist}
Summary:        An OpenGl framework

Group:          System Environment/Libraries
License:        zlib
URL:            http://glfw.sourceforge.net
Patch0:		glfw-makefiles.patch
Source0:        glfw-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libX11-devel, libXrandr-devel, pth-devel, freeglut-devel

%description
GLFW is a free, open source, portable framework for OpenGL 
application development.

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

%description devel
Development files for %{name}

%package doc
Summary: Development files for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release} pkgconfig

%description doc
Documentation files for %{name}

%prep
%setup -q -n glfw
# fix libdir
sed -i -e 's!@libdir@!%{buildroot}%{_libdir}!' %{PATCH0}
%patch0 -p1 -b .orig
sed -i -e 's!%{buildroot}%{_libdir}!@libdir@!' %{PATCH0}
sed -i -e 's!@lib@!%{_libdir}!' compile.sh
sed -i -e 's!@br@!%{buildroot}!' lib/x11/Makefile.x11.in

%build
sh ./compile.sh 
make x11

%install
rm -rf %{buildroot}
make x11-install
# more fixes as the makefile messes things up!
sed -i -e 's!%{buildroot}/usr!%{_prefix}!' lib/x11/libglfw.pc
mkdir -p %{buildroot}%{_includedir}/GL
mv %{buildroot}/usr/local/include/GL/glfw.h %{buildroot}%{_includedir}/GL/glfw.h
rm -rf %{buildroot}/usr/local
rm %{buildroot}%{_libdir}/pkgconfig/libglfw.pc
install -c -m 644 lib/x11/libglfw.pc %{buildroot}%{_libdir}/pkgconfig/libglfw.pc
install -c -m 644 lib/x11/libglfw.so %{buildroot}%{_libdir}/libglfw.so
rm %{buildroot}%{_libdir}/*.a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc license.txt 

%files doc
%defattr(-,root,root,-)
%doc docs/*.pdf

%files devel
%defattr(-,root,root,-)
%{_includedir}/GL/glfw.h
%{_libdir}/libglfw.so
%{_libdir}/pkgconfig/*

%changelog
* Sat Nov 08 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
- spec fixes for review 
- added doc subpackage

* Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
- Initial version




--- NEW FILE import.log ---
libglfw-2_6-2_fc10:F-10:libglfw-2.6-2.fc10.src.rpm:1227617864


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libglfw/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2008 20:20:14 -0000	1.1
+++ .cvsignore	25 Nov 2008 12:58:15 -0000	1.2
@@ -0,0 +1 @@
+glfw-2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libglfw/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2008 20:20:14 -0000	1.1
+++ sources	25 Nov 2008 12:58:15 -0000	1.2
@@ -0,0 +1 @@
+0d9b93e6194c3805be9e1c855a985a24  glfw-2.6.tar.bz2