rpms/libQGLViewer/F-10 libQGLViewer-2.3.1-exit.patch, NONE, 1.1 libQGLViewer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Laurent Rineau rineau at fedoraproject.org
Mon Mar 30 22:06:34 UTC 2009


Author: rineau

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

Modified Files:
	.cvsignore sources 
Added Files:
	libQGLViewer-2.3.1-exit.patch libQGLViewer.spec 
Log Message:
First import for F-10.

libQGLViewer-2.3.1-exit.patch:

--- NEW FILE libQGLViewer-2.3.1-exit.patch ---
diff -up libQGLViewer-2.3.1/QGLViewer/VRender/gpc.cpp.exit libQGLViewer-2.3.1/QGLViewer/VRender/gpc.cpp
--- libQGLViewer-2.3.1/QGLViewer/VRender/gpc.cpp.exit	2009-01-06 13:55:12.000000000 +0100
+++ libQGLViewer-2.3.1/QGLViewer/VRender/gpc.cpp	2009-01-06 13:55:26.000000000 +0100
@@ -150,7 +150,7 @@ using namespace std ;
 #define MALLOC(p, b, s, t) {if ((b) > 0) { \
                             p= (t*)malloc(b); if (!(p)) { \
                             fprintf(stderr, "gpc malloc failure: %s\n", s); \
-                            exit(0);}} else p= NULL;}
+                            abort();}} else p= NULL;}
 
 #define FREE(p)            {if (p) {free(p); (p)= NULL;}}
 


--- NEW FILE libQGLViewer.spec ---
Name:           libQGLViewer
Version:        2.3.1
Release:        7%{?dist}
Summary:        Qt based OpenGL generic 3D viewer library

Group:          System Environment/Libraries
License:        GPLv2 with exceptions or GPLv3 with exceptions 
URL:            http://www.libqglviewer.com/index.html
Source0:        http://www.libqglviewer.com/src/%{name}-%{version}.tar.gz

# QGLViewer/VRender/gpc.cpp uses exit(0) to "abort" from a failure of malloc
# Use abort() instead.
Patch0:         libQGLViewer-2.3.1-exit.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt4-devel

%description
%{name} is a C++ library based on Qt that eases the creation of OpenGL
3D viewers. It provides some of the typical 3D viewer functionalities, such
as the possibility to move the camera using the mouse, which lacks in most
of the other APIs. Other features include mouse manipulated frames,
interpolated keyFrames, object selection, stereo display, screenshot saving
and much more. It can be used by OpenGL beginners as well as to create
complex applications, being fully customizable and easy to extend.


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

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


%package doc
Summary: API documentation, demos and example programs for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description doc
%{summary}.

%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .exit

# Fix the encoding of several files, so that they all use utf-8.
for f in doc/*.html doc/examples/*.html \
        examples/contribs/terrain/quadtree.cpp \
        examples/contribs/terrain/viewer.cpp \
        examples/contribs/quarto/piece.cpp \
        examples/contribs/dvonn/dvonnwindowimpl.cpp \
        examples/luxo/luxo.cpp \
        examples/contribs/quarto/jeu.cpp \
        examples/contribs/terrain/terrain.cpp \
        examples/contribs/quarto/rules.txt;
do
  cp -a $f $f.bak
  rm -f $f
  sed -e 's/charset=iso-8859-1/charset=utf-8/' < $f.bak | iconv -f l1 -t utf8 > $f;
  touch -r $f.bak $f
  rm -f $f.bak
done

%build
cd QGLViewer
%{_qt4_qmake} \
          LIB_DIR=%{_libdir} \
          DOC_DIR=%{_defaultdocdir}/%{name}-%{version} \
          INCLUDE_DIR=%{_includedir}
make %{?_smp_mflags}
cd ../designerPlugin
%{_qt4_qmake} LIB_DIR=../QGLViewer
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
cd QGLViewer
make -f Makefile -e INSTALL_ROOT=$RPM_BUILD_ROOT install_target install_include
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm $RPM_BUILD_ROOT%{_libdir}/libQGLViewer.prl
cd ../designerPlugin
make -e INSTALL_ROOT=$RPM_BUILD_ROOT install

%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README LICENCE CHANGELOG GPL_EXCEPTION
%{_libdir}/libQGLViewer.so.2*

%files devel
%defattr(-,root,root,-)
%{_includedir}/QGLViewer/
%{_libdir}/libQGLViewer.so
%{_qt4_plugindir}/designer/libqglviewerplugin.so

%files doc
%defattr(-,root,root,-)
%doc doc
%doc examples

%changelog
* Mon Mar 30 2009  <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-7
- Remove glibc-common from BR:

* Tue Jan  6 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-6
- Merge the subpackage -designer-plugin into -devel.
- Add Requires: qt4-devel to -devel.

* Tue Jan  6 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-5
- Correct License: tag.

* Tue Jan  6 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-4
- Add the file GPL_EXCEPTION to docs.

* Tue Jan  6 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-3
- Untabify the spec file.

* Tue Jan  6 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-2
- Update the URL.
- Add a patch that change exit(0) to abort() in QGLViewer/VRender/gpc.cpp.
- Use macros %%{_qt4_qmake} and %%{_qt4_plugindir} from /etc/rpm/macros.qt4
- Remove %%{_libdir}/libQGLViewer.prl (useless, and rpmlint outputs an
  error about it in %%{_libdir}

* Wed Dec 17 2008 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-1
- New release.

* Tue Oct 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 2.2.6-2
- Add examples in %%{name}-doc

* Tue Oct 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 2.2.6-1
- New upstream release.

* Tue Apr  3 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 2.2.5-2
- Add the designer-plugin sub-package.

* Mon Jan 29 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 2.2.5-1
- First release to be submitted to Fedora.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libQGLViewer/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Mar 2009 21:29:22 -0000	1.1
+++ .cvsignore	30 Mar 2009 22:06:04 -0000	1.2
@@ -0,0 +1,2 @@
+libQGLViewer-2.3.1.tar.gz
+clog


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libQGLViewer/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Mar 2009 21:29:22 -0000	1.1
+++ sources	30 Mar 2009 22:06:04 -0000	1.2
@@ -0,0 +1 @@
+bede65612dd6230127f844bc5bdf2c9f  libQGLViewer-2.3.1.tar.gz




More information about the fedora-extras-commits mailing list