packages: goptical/goptical-info.patch (NEW), goptical/goptical-sh.patch (N...

qboosh qboosh at pld-linux.org
Tue Nov 15 17:55:28 CET 2011


Author: qboosh                       Date: Tue Nov 15 16:55:28 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new

---- Files affected:
packages/goptical:
   goptical-info.patch (NONE -> 1.1)  (NEW), goptical-sh.patch (NONE -> 1.1)  (NEW), goptical.spec (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/goptical/goptical-info.patch
diff -u /dev/null packages/goptical/goptical-info.patch:1.1
--- /dev/null	Tue Nov 15 17:55:28 2011
+++ packages/goptical/goptical-info.patch	Tue Nov 15 17:55:23 2011
@@ -0,0 +1,14 @@
+--- goptical-0.90/doc/texinfo/goptical.texi.orig	2011-11-09 20:52:20.000000000 +0100
++++ goptical-0.90/doc/texinfo/goptical.texi	2011-11-15 17:44:30.037392226 +0100
+@@ -18,9 +18,9 @@
+ @end copying
+ 
+ @ifnottex
+- at dircategory Scientific software
++ at dircategory Libraries:
+ @direntry
+-* goptical:                   GNU Optical design and simulation library
++* goptical:				GNU Optical design and simulation library
+ @end direntry
+ @end ifnottex
+ 

================================================================
Index: packages/goptical/goptical-sh.patch
diff -u /dev/null packages/goptical/goptical-sh.patch:1.1
--- /dev/null	Tue Nov 15 17:55:28 2011
+++ packages/goptical/goptical-sh.patch	Tue Nov 15 17:55:23 2011
@@ -0,0 +1,144 @@
+--- goptical-0.90/configure.ac.orig	2011-11-09 20:52:20.000000000 +0100
++++ goptical-0.90/configure.ac	2011-11-14 19:31:49.171381508 +0100
+@@ -25,13 +25,13 @@
+ AC_PROG_LIBTOOL
+ AC_LANG(C++)
+ 
+-CXXFLAGS+=" -Wall "
++CXXFLAGS="$CXXFLAGS -Wall "
+ 
+ AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug, [Enable debug and asserts]), enable_debug=yes)
+ if test "x$enable_debug" = "xyes" ; then
+-   CXXFLAGS+=" -g "
++   CXXFLAGS="$CXXFLAGS -g "
+ else
+-   CPPFLAGS+=" -DNDEBUG "
++   CPPFLAGS="$CXXFLAGS -DNDEBUG "
+ fi
+ 
+ AC_CHECK_LIB(m, cosf, , AC_MSG_ERROR([can not find m library]))
+@@ -51,7 +51,7 @@
+     AC_CHECK_HEADER(GL/glut.h, [
+       GOPTICAL_HAVE_GL=true
+       AC_DEFINE(GOPTICAL_HAVE_GL, 1, [gl rendering library enabled])
+-      LDFLAGS+=" -lglut -lGL -lGLU "
++      LDFLAGS="$LDFLAGS -lglut -lGL -lGLU "
+     ])
+   ])
+ ])
+@@ -62,15 +62,15 @@
+ AC_CHECK_HEADER(X11/Xlib.h, [
+   GOPTICAL_HAVE_X11=true
+   AC_DEFINE(GOPTICAL_HAVE_X11, 1, [x11 rendering library enabled])
+-  LDFLAGS+=" -lX11 "
++  LDFLAGS="$LDFLAGS -lX11 "
+ ])
+ fi
+ AM_CONDITIONAL(GOPTICAL_HAVE_X11, test x$GOPTICAL_HAVE_X11 = xtrue)
+ 
+ abs_srcdir=`cd $srcdir ; pwd`
+ abs_builddir=`pwd`
+-ac_configure_args+=" --with-goptical-core-include=$abs_srcdir/goptical_core/src "
+-ac_configure_args+=" --with-goptical-core-lib=$abs_builddir/goptical_core/src/libgoptical.la "
++ac_configure_args="$ac_configure_args --with-goptical-core-include=$abs_srcdir/goptical_core/src "
++ac_configure_args="$ac_configure_args --with-goptical-core-lib=$abs_builddir/goptical_core/src/libgoptical.la "
+ 
+ AC_CONFIG_FILES([
+   Makefile
+--- goptical-0.90/goptical_core/configure.ac.orig	2011-11-09 20:52:20.000000000 +0100
++++ goptical-0.90/goptical_core/configure.ac	2011-11-14 19:32:53.521383663 +0100
+@@ -29,16 +29,16 @@
+ 
+ AC_LANG(C++)
+ 
+-CXXFLAGS+=" -Wall "
++CXXFLAGS="$CXXFLAGS -Wall "
+ 
+ AC_ARG_ENABLE(tests, AC_HELP_STRING(--disable-tests, [Disable compilation of tests]), disable_tests=yes)
+ AM_CONDITIONAL(TESTS, test x$disable_tests != xyes)
+ 
+ AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug, [Enable debug and asserts]), enable_debug=yes)
+ if test "x$enable_debug" = "xyes" ; then
+-   CXXFLAGS+=" -g "
++   CXXFLAGS="$CXXFLAGS -g "
+ else
+-   CPPFLAGS+=" -DNDEBUG "
++   CPPFLAGS="$CXXFLAGS -DNDEBUG "
+ fi
+ 
+ AC_CHECK_LIB(m, cosf, , AC_MSG_ERROR([can not find m library]))
+@@ -50,13 +50,13 @@
+ AC_ARG_ENABLE(plplot, AC_HELP_STRING(--disable-plplot, [Disable use of PlPlot renderer]), GOPTICAL_HAVE_PLPLOT=false)
+ 
+ AC_CHECK_HEADER(gsl/gsl_math.h, , AC_MSG_ERROR([GNU scientific library (libgsl) is missing]))
+-LDFLAGS+=" -lgsl -lgslcblas "
++LDFLAGS="$LDFLAGS -lgsl -lgslcblas "
+ 
+ if test x$GOPTICAL_HAVE_DIME != xfalse ; then
+ AC_CHECK_HEADER(dime/Base.h, [
+   GOPTICAL_HAVE_DIME=true
+   AC_DEFINE(GOPTICAL_HAVE_DIME, 1, [dime DXF rendering library enabled])
+-  LDFLAGS+=" -ldime "
++  LDFLAGS="$LDFLAGS -ldime "
+ ])
+ fi
+ AM_CONDITIONAL(GOPTICAL_HAVE_DIME, test x$GOPTICAL_HAVE_DIME = xtrue)
+@@ -65,7 +65,7 @@
+ AC_CHECK_HEADER(gd.h, [
+   GOPTICAL_HAVE_GD=true
+   AC_DEFINE(GOPTICAL_HAVE_GD, 1, [gd rendering library enabled])
+-  LDFLAGS+=" -lgd "
++  LDFLAGS="$LDFLAGS -lgd "
+ ])
+ fi
+ AM_CONDITIONAL(GOPTICAL_HAVE_GD, test x$GOPTICAL_HAVE_GD = xtrue)
+@@ -76,7 +76,7 @@
+     AC_CHECK_HEADER(GL/glut.h, [
+       GOPTICAL_HAVE_GL=true
+       AC_DEFINE(GOPTICAL_HAVE_GL, 1, [gl rendering library enabled])
+-      LDFLAGS+=" -lglut -lGL -lGLU "
++      LDFLAGS="$LDFLAGS -lglut -lGL -lGLU "
+     ])
+   ])
+ ])
+@@ -87,7 +87,7 @@
+ AC_CHECK_HEADER(X11/Xlib.h, [
+   GOPTICAL_HAVE_X11=true
+   AC_DEFINE(GOPTICAL_HAVE_X11, 1, [x11 rendering library enabled])
+-  LDFLAGS+=" -lX11 "
++  LDFLAGS="$LDFLAGS -lX11 "
+ ])
+ fi
+ AM_CONDITIONAL(GOPTICAL_HAVE_X11, test x$GOPTICAL_HAVE_X11 = xtrue)
+@@ -96,7 +96,7 @@
+ AC_CHECK_HEADER(plplot/plstream.h, [
+   GOPTICAL_HAVE_PLPLOT=true
+   AC_DEFINE(GOPTICAL_HAVE_PLPLOT, 1, [plplot rendering library enabled])
+-  LDFLAGS+=" -lplplotcxxd -lplplotd "
++  LDFLAGS="$LDFLAGS -lplplotcxxd -lplplotd "
+ ])
+ fi
+ AM_CONDITIONAL(GOPTICAL_HAVE_PLPLOT, test x$GOPTICAL_HAVE_PLPLOT = xtrue)
+--- goptical-0.90/goptical_design/configure.ac.orig	2011-11-09 20:52:19.000000000 +0100
++++ goptical-0.90/goptical_design/configure.ac	2011-11-14 19:33:30.608051572 +0100
+@@ -27,7 +27,7 @@
+ AC_PROG_LIBTOOL
+ AC_LANG(C++)
+ 
+-CXXFLAGS+=" -Wall "
++CXXFLAGS="$CXXFLAGS -Wall "
+ CXXFLAGS="$GOPTICAL_CXXFLAGS $CXXFLAGS"
+ LDFLAGS="$GOPTICAL_LDFLAGS $LDFLAGS"
+ 
+@@ -36,9 +36,9 @@
+ 
+ AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug, [Enable debug and asserts]), enable_debug=yes)
+ if test "x$enable_debug" = "xyes" ; then
+-   CXXFLAGS+=" -g "
++   CXXFLAGS="$CXXFLAGS -g "
+ else
+-   CPPFLAGS+=" -DNDEBUG "
++   CPPFLAGS="$CXXFLAGS -DNDEBUG "
+ fi
+ 
+ AC_ARG_WITH([goptical-core-include],

================================================================
Index: packages/goptical/goptical.spec
diff -u /dev/null packages/goptical/goptical.spec:1.1
--- /dev/null	Tue Nov 15 17:55:28 2011
+++ packages/goptical/goptical.spec	Tue Nov 15 17:55:23 2011
@@ -0,0 +1,146 @@
+# $Revision$, $Date$
+# TODO: dime (DXF renderer), plplot (renderer)
+#
+# Conditional build:
+%bcond_without	static_libs	# don't build static libraries
+#
+Summary:	GNU Optical design and simulation library
+Summary(pl.UTF-8):	Biblioteka do projektowania i symulacji optycznych GNU Optical
+Name:		goptical
+Version:	0.90
+Release:	0.1
+License:	GPL v3+
+Group:		Libraries
+Source0:	http://alpha.gnu.org/gnu/goptical/%{name}-%{version}.tar.gz
+# Source0-md5:	ad3c85d16815ee8673908780ec287763
+Patch0:		%{name}-sh.patch
+Patch1:		%{name}-info.patch
+URL:		http://gnu.org/software/goptical/
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	OpenGL-glut-devel
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
+BuildRequires:	gd-devel
+BuildRequires:	gsl-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
+BuildRequires:	xorg-lib-libX11-devel
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Goptical is a C++ optical design and simulation library. Goptical is
+free software and is part of the GNU project.
+
+It provides model classes for optical components, surfaces and
+materials. It enables building optical systems by creating and
+placing various optical components in a 3D space and simulates light
+propagation through the system. Classical optical design analysis
+tools can be used on optical systems.
+
+%description -l pl.UTF-8
+Goptical to biblioteka C++ do projektowania i symulacji optycznych.
+Jest to oprogramowanie wolnodostępne, będące częścią projektu GNU.
+
+Udostępnia klasy modeli dla elementów optycznych, powierzchni oraz
+materiałów. Pozwala na konstruowanie systemów optycznych poprzez
+tworzenie i umieszczanie różnych elementów optycznych w przestrzeni
+trójwymiarowej, a następnie symulowanie rozprowadzania światła przez
+te systemy. W tych systemach optycznych można używać klasycznych
+narzędzi do analizy optycznej.
+
+%package devel
+Summary:	Header files for Goptical libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek Goptical
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	gd-devel
+Requires:	gsl-devel
+Requires:	libstdc++-devel
+Requires:	xorg-lib-libX11-devel
+
+%description devel
+Header files for Goptical libraries.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek Goptical.
+
+%package static
+Summary:	Static Goptical libraries
+Summary(pl.UTF-8):	Statyczne biblioteki Goptical
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static Goptical libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki Goptical.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+cd goptical_core
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../goptical_design
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+cd ..
+%configure \
+	%{?with_static_libs:--enable-static}
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS README
+%attr(755,root,root) %{_libdir}/libgoptical-1.0.so
+%attr(755,root,root) %{_libdir}/libgoptical_design-1.0.so
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgoptical.so
+%attr(755,root,root) %{_libdir}/libgoptical_design.so
+%{_libdir}/libgoptical.la
+%{_libdir}/libgoptical_design.la
+%{_includedir}/Goptical
+%{_infodir}/goptical.info*
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgoptical.a
+%{_libdir}/libgoptical_design.a
+%endif
+
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1  2011/11/15 16:55:23  qboosh
+- new
================================================================


More information about the pld-cvs-commit mailing list