rpms/osgal/devel osgal-cvs-debian-01.dpatch, NONE, 1.1 osgal-cvs-debian-02.dpatch, NONE, 1.1 osgal-cvs-debian-03.dpatch, NONE, 1.1 osgal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Christopher Stone (xulchris) fedora-extras-commits at redhat.com
Fri Jun 9 18:42:59 UTC 2006 

Author: xulchris

Update of /cvs/extras/rpms/osgal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1891/devel

Modified Files:
	.cvsignore sources 
Added Files:
	osgal-cvs-debian-01.dpatch osgal-cvs-debian-02.dpatch 
	osgal-cvs-debian-03.dpatch osgal.spec 
Log Message:
auto-import osgal-20060410-2 on branch devel from osgal-20060410-2.src.rpm


--- NEW FILE osgal-cvs-debian-01.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run

@DPATCH@
Index: src/osgAL/Makefile.am
===================================================================
RCS file: /cvs/underware/osgal/src/osgAL/Makefile.am,v
retrieving revision 1.3
diff -b -B -u -r1.3 Makefile.am
--- osgal/src/osgAL/Makefile.am	15 Feb 2006 23:35:08 -0000	1.3
+++ osgal/src/osgAL/Makefile.am	17 Feb 2006 14:42:30 -0000
@@ -11,7 +11,7 @@
     OccludeCallback.cpp
 
 libosgal_la_SOURCES = $(basicfiles)
-
+libosgal_la_LDFLAGS = -version-info 1:0:0
 
 lib_LTLIBRARIES = libosgal.la
 


--- NEW FILE osgal-cvs-debian-02.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run

@DPATCH@
Index: include/osgAL/SoundManager
===================================================================
RCS file: /cvs/underware/osgal/include/osgAL/SoundManager,v
retrieving revision 1.1.1.3
diff -b -B -u -r1.1.1.3 SoundManager
--- osgal/include/osgAL/SoundManager	7 Sep 2005 16:11:36 -0000	1.1.1.3
+++ osgal/include/osgAL/SoundManager	14 Mar 2006 17:01:03 -0000
@@ -110,12 +110,12 @@
     path there. If it can be found, it will return to that Sample.
     Otherwise it will be loaded from disk.
   */
-  openalpp::Sample* SoundManager::getSample( const std::string& path, bool add_to_cache=true );
+  openalpp::Sample* getSample( const std::string& path, bool add_to_cache=true );
 
   /*! 
     Clear the sample cache with all loaded samples.
   */
-  void SoundManager::clearSampleCache(void) {  m_sample_cache.clear(); }
+  void clearSampleCache(void) {  m_sample_cache.clear(); }
 
 
   /*! 
@@ -125,12 +125,12 @@
     path there. If it can be found, it will return to that Stream.
     Otherwise it will be loaded from disk.
   */
-  openalpp::Stream* SoundManager::getStream( const std::string& path, bool add_to_cache=true );
+  openalpp::Stream* getStream( const std::string& path, bool add_to_cache=true );
 
   /*! 
     Clear the Stream cache with all loaded streams.
   */
-  void SoundManager::clearStreamCache(void) {  m_stream_cache.clear(); }
+  void clearStreamCache(void) {  m_stream_cache.clear(); }
 
 
   /*!


--- NEW FILE osgal-cvs-debian-03.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run

@DPATCH@
Index: include/osgAL/OccludeCallback
===================================================================
RCS file: /cvs/underware/osgal/include/osgAL/OccludeCallback,v
retrieving revision 1.1.1.2
diff -b -B -u -r1.1.1.2 OccludeCallback
--- osgcal-cvs/include/osgAL/OccludeCallback	7 Sep 2005 16:11:36 -0000	1.1.1.2
+++ osgcal-cvs/include/osgAL/OccludeCallback	26 Mar 2006 12:12:47 -0000
@@ -66,6 +66,7 @@
     // Implementation of virtual functions of osg::Object
   virtual osg::Object* cloneType() const { return new OccludeCallback(); }
   virtual osg::Object* clone(const osg::CopyOp& copyop) const {
+	(void)copyop; 
 	return new OccludeCallback(*this); 
   }
   virtual const char* libraryName() const { return "osgAL"; }
Index: include/osgAL/SoundState
===================================================================
RCS file: /cvs/underware/osgal/include/osgAL/SoundState,v
retrieving revision 1.1.1.3
diff -b -B -u -r1.1.1.3 SoundState
--- osgcal-cvs/include/osgAL/SoundState	7 Sep 2005 16:11:36 -0000	1.1.1.3
+++ osgcal-cvs/include/osgAL/SoundState	26 Mar 2006 12:12:47 -0000
@@ -88,6 +88,7 @@
   // Implementation of virtual functions of osg::Object
   virtual osg::Object* cloneType() const { return new SoundState(); }
   virtual osg::Object* clone(const osg::CopyOp& copyop) const {
+	(void)copyop; 
 	return new SoundState(*this); 
   }
   virtual const char* libraryName() const { return "osgAL"; }


--- NEW FILE osgal.spec ---
Name:           osgal
Version:	20060410
Release:        2%{?dist}
Summary:        Adapts OpenSceneGraph to use OpenAL++
Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.vrlab.umu.se/research/osgAL
Source0:        http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz
Patch0:         osgal-cvs-debian-01.dpatch
Patch1:         osgal-cvs-debian-02.dpatch
Patch2:         osgal-cvs-debian-03.dpatch
BuildRoot:      %{_tmppath}/%{name}-cvs-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  OpenSceneGraph-devel openalpp-devel freealut-devel libvorbis-devel
BuildRequires:  pkgconfig

%if "%fedora" > "4"
BuildRequires:  libGL-devel
%else
BuildRequires:	xorg-x11-devel
%endif

%description
osgAL is a toolkit for handling spatial (3D) sound in the OpenSceneGraph
rendering library.

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

%description devel
This package contains headers and libraries required to build applications
that use osgAL.

%prep
%setup -q -n %{name}-cvs-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

# Fix rpmlint errors
%{__chmod} -x AUTHORS COPYING NEWS README

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall

%check
%{__make} %{?_smp_mflags} check

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/*.so.*

%files devel
%doc doc/html/*
%{_includedir}/osgAL
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%exclude %{_libdir}/*.la

%changelog
* Fri Jun 02 2006 Christopher Stone <chris.stone at gmail.com> 20060410-2
- Fix BuildRequires to work with both FC4 and FC5
- Update Summary and %%description
- Fix Group
- Use macros for system commands
- Add %%doc files to main and devel packages
- Add a %%check section
- Remove gcc-c++ from BuildRequires
- Add pkgconfig to BuildRequires
- Fix License tag
- Remove openal-devel since this is picked up by openalpp-devel
- Add openalpp-devel to devel package Requires

* Mon Apr 10 2006 Loic Dachary <loic at gnu.org> 20060410-1
- upstream sync

* Mon Mar 27 2006 Loic Dachary <loic at gnu.org> 20060215-3
- commented mesaLib-GL (fedora5 specific)

* Sun Mar 26 2006 Christopher Stone <chris.stone at gmail.com> 20060215-2
- Fix BuildRequires
- Add gcc41 patch

* Wed Mar 22 2006 Loic Dachary <loic at gnu.org> 20060215-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jun 2006 18:42:10 -0000	1.1
+++ .cvsignore	9 Jun 2006 18:42:58 -0000	1.2
@@ -0,0 +1 @@
+osgal-cvs-20060410.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jun 2006 18:42:10 -0000	1.1
+++ sources	9 Jun 2006 18:42:58 -0000	1.2
@@ -0,0 +1 @@
+303cf7af02b268b5f02252fe60b65c87  osgal-cvs-20060410.tar.gz

More information about the scm-commits mailing list