rpms/ogre/devel .cvsignore, 1.15, 1.16 ogre.spec, 1.39, 1.40 sources, 1.16, 1.17

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18920

Modified Files:
	.cvsignore ogre.spec sources 
Log Message:
* Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 1.6.0-3
- Remove non-free fonts from samples subpackage (rh 477434)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	7 Nov 2008 10:39:19 -0000	1.15
+++ .cvsignore	27 Dec 2008 14:35:53 -0000	1.16
@@ -1 +1 @@
-ogre-1.6.0-clean.tar.bz2
+ogre-1.6.0-clean-v2.tar.bz2


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ogre.spec	3 Dec 2008 12:45:53 -0000	1.39
+++ ogre.spec	27 Dec 2008 14:35:53 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 # CC-BY-SA is for devel docs
 License:        LGPLv2+ and CC-BY-SA
@@ -10,7 +10,8 @@
 # With the non free licensed headers under RenderSystems/GL/include/GL removed
 # And GLEW sources updated to 1.5.0 - upstream notified http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
 # And non-free chiropteraDM.pk3 under Samples/Media/packs removed
-Source0:        %{name}-%{version}-clean.tar.bz2
+# And non-free fonts under Samples/Media/fonts removed
+Source0:        %{name}-%{version}-clean-v2.tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
 #Patch1:         ogre-1.6.0-system-glew.patch
@@ -58,7 +59,7 @@
 %package samples
 Summary:        Ogre samples executables and media
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}, dejavu-fonts-lgc-sans
 
 %description samples
 This package contains the compiled (not the source) sample applications coming
@@ -152,6 +153,14 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
 cp -a Samples/Media $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
+ln -s ../../../../fonts/dejavu/DejaVuLGCSans-Bold.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/bluebold.ttf
+ln -s ../../../../fonts/dejavu/DejaVuLGCSans.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/bluehigh.ttf
+ln -s ../../../../fonts/dejavu/DejaVuLGCSansCondensed.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/bluecond.ttf
+ln -s ../../../../fonts/dejavu/DejaVuLGCSans.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/solo5.ttf       
 
 
 %clean
@@ -197,6 +206,9 @@
 
 
 %changelog
+* Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 1.6.0-3
+- Remove non-free fonts from samples subpackage (rh 477434)
+
 * Wed Dec  3 2008 Hans de Goede <hdegoede at redhat.com> 1.6.0-2
 - Rebuild for new cegui
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Nov 2008 10:39:19 -0000	1.16
+++ sources	27 Dec 2008 14:35:53 -0000	1.17
@@ -1 +1 @@
-e5d073387fd1f424caaaa3f2b5d038c9  ogre-1.6.0-clean.tar.bz2
+1f6ab3e6dbc3d30f43defc72a7c454e1  ogre-1.6.0-clean-v2.tar.bz2