rpms/gts/devel gts-0.7.6-gts_config.diff, NONE, 1.1 gts-0.7.6-includedir.diff, NONE, 1.1 gts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Ed Hill (edhill) fedora-extras-commits at redhat.com
Sun May 21 20:27:23 UTC 2006 

Author: edhill

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

Modified Files:
	.cvsignore sources 
Added Files:
	gts-0.7.6-gts_config.diff gts-0.7.6-includedir.diff gts.spec 
Log Message:
auto-import gts-0.7.6-4 on branch devel from gts-0.7.6-4.src.rpm

gts-0.7.6-gts_config.diff:

--- NEW FILE gts-0.7.6-gts_config.diff ---
--- gts-0.7.6.ORIG/src/gts-config.in	2006-05-18 20:42:33.000000000 -0400
+++ gts-0.7.6/src/gts-config.in	2006-05-21 15:56:45.000000000 -0400
@@ -107,28 +107,8 @@
 	echo $exec_prefix
 fi
 if test "$echo_cflags" = "yes"; then
-	if test "$lib_gmodule" = "yes"; then
-	    glib_cflags="$glib_cflags $glib_module_cflags"
-	fi
-	if test "$lib_gthread" = "yes"; then
-	    glib_cflags="$glib_cflags $glib_thread_cflags"
-	fi
-	glib_cflags="$glib_cflags -I${prefix}/include"
-	glib_cflags=`uniquify "$glib_cflags"`
-        if test "$echo_check" = "yes"; then
-	    echo -DGTS_CHECK_CASTS $glib_cflags
-        else
-	    echo $glib_cflags
-	fi
+	pkg-config --cflags gts
 fi
 if test "$echo_libs" = "yes"; then
-	if test "$lib_gmodule" = "yes"; then
-	    glib_libs="$glib_libs $glib_module_libs"
-	fi
-	if test "$lib_gthread" = "yes"; then
-	    glib_libs="$glib_libs $glib_thread_libs"
-	fi
-	glib_libs="-L${exec_prefix}/lib -lgts $glib_libs -lm"
-	glib_libs=`uniquify "$glib_libs"`
-	echo $glib_libs
+	pkg-config --libs gts
 fi

gts-0.7.6-includedir.diff:

--- NEW FILE gts-0.7.6-includedir.diff ---
diff -ur gts-0.7.6.orig/examples/Makefile.am gts-0.7.6/examples/Makefile.am
--- gts-0.7.6.orig/examples/Makefile.am	2005-03-09 03:18:56.000000000 +0100
+++ gts-0.7.6/examples/Makefile.am	2006-05-19 14:30:04.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src\
 	 -DG_LOG_DOMAIN=\"Gts-examples\"
 LDADD = $(top_builddir)/src/libgts.la -lm
 DEPS = $(top_builddir)/src/libgts.la
diff -ur gts-0.7.6.orig/examples/Makefile.in gts-0.7.6/examples/Makefile.in
--- gts-0.7.6.orig/examples/Makefile.in	2006-03-10 01:31:05.000000000 +0100
+++ gts-0.7.6/examples/Makefile.in	2006-05-19 14:30:38.000000000 +0200
@@ -293,7 +293,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src\
 	 -DG_LOG_DOMAIN=\"Gts-examples\"
 
 LDADD = $(top_builddir)/src/libgts.la -lm
diff -ur gts-0.7.6.orig/src/Makefile.am gts-0.7.6/src/Makefile.am
--- gts-0.7.6.orig/src/Makefile.am	2005-01-19 05:48:22.000000000 +0100
+++ gts-0.7.6/src/Makefile.am	2006-05-19 14:30:04.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(includedir) -DG_LOG_DOMAIN=\"Gts\"
+INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Gts\"
 
 bin_SCRIPTS=gts-config
 
diff -ur gts-0.7.6.orig/src/Makefile.in gts-0.7.6/src/Makefile.in
--- gts-0.7.6.orig/src/Makefile.in	2006-03-10 01:31:05.000000000 +0100
+++ gts-0.7.6/src/Makefile.in	2006-05-19 14:30:38.000000000 +0200
@@ -222,7 +222,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir) -I$(includedir) -DG_LOG_DOMAIN=\"Gts\"
+INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Gts\"
 bin_SCRIPTS = gts-config
 BUILT_SOURCES = \
 	gts-config \
diff -ur gts-0.7.6.orig/test/boolean/Makefile.am gts-0.7.6/test/boolean/Makefile.am
--- gts-0.7.6.orig/test/boolean/Makefile.am	2005-01-19 05:47:06.000000000 +0100
+++ gts-0.7.6/test/boolean/Makefile.am	2006-05-19 14:30:04.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src\
 	 -DG_LOG_DOMAIN=\"Gts-test\"
 LDADD = $(top_builddir)/src/libgts.la -lm
 DEPS = $(top_builddir)/src/libgts.la
diff -ur gts-0.7.6.orig/test/boolean/Makefile.in gts-0.7.6/test/boolean/Makefile.in
--- gts-0.7.6.orig/test/boolean/Makefile.in	2006-03-10 01:31:06.000000000 +0100
+++ gts-0.7.6/test/boolean/Makefile.in	2006-05-19 14:30:38.000000000 +0200
@@ -198,7 +198,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src\
 	 -DG_LOG_DOMAIN=\"Gts-test\"
 
 LDADD = $(top_builddir)/src/libgts.la -lm
diff -ur gts-0.7.6.orig/test/coarsen/Makefile.am gts-0.7.6/test/coarsen/Makefile.am
--- gts-0.7.6.orig/test/coarsen/Makefile.am	2005-01-19 05:47:06.000000000 +0100
+++ gts-0.7.6/test/coarsen/Makefile.am	2006-05-19 14:30:04.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src\
 	 -DG_LOG_DOMAIN=\"Gts-test\"
 LDADD = $(top_builddir)/src/libgts.la -lm
 DEPS = $(top_builddir)/src/libgts.la
diff -ur gts-0.7.6.orig/test/coarsen/Makefile.in gts-0.7.6/test/coarsen/Makefile.in
--- gts-0.7.6.orig/test/coarsen/Makefile.in	2006-03-10 01:31:06.000000000 +0100
+++ gts-0.7.6/test/coarsen/Makefile.in	2006-05-19 14:30:38.000000000 +0200
@@ -208,7 +208,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src\
 	 -DG_LOG_DOMAIN=\"Gts-test\"
 
 LDADD = $(top_builddir)/src/libgts.la -lm
diff -ur gts-0.7.6.orig/test/delaunay/Makefile.am gts-0.7.6/test/delaunay/Makefile.am
--- gts-0.7.6.orig/test/delaunay/Makefile.am	2005-01-19 05:47:06.000000000 +0100
+++ gts-0.7.6/test/delaunay/Makefile.am	2006-05-19 14:30:04.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir) \
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
 	 -DG_LOG_DOMAIN=\"Gts-test\"
 LDADD = $(top_builddir)/src/libgts.la -lm
 DEPS = $(top_builddir)/src/libgts.la
diff -ur gts-0.7.6.orig/test/delaunay/Makefile.in gts-0.7.6/test/delaunay/Makefile.in
--- gts-0.7.6.orig/test/delaunay/Makefile.in	2006-03-10 01:31:06.000000000 +0100
+++ gts-0.7.6/test/delaunay/Makefile.in	2006-05-19 14:30:38.000000000 +0200
@@ -193,7 +193,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir) \
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
 	 -DG_LOG_DOMAIN=\"Gts-test\"
 
 LDADD = $(top_builddir)/src/libgts.la -lm
diff -ur gts-0.7.6.orig/tools/Makefile.am gts-0.7.6/tools/Makefile.am
--- gts-0.7.6.orig/tools/Makefile.am	2005-01-19 05:47:06.000000000 +0100
+++ gts-0.7.6/tools/Makefile.am	2006-05-19 14:30:04.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src\
 	 -DG_LOG_DOMAIN=\"Gts-tools\"
 LDADD = $(top_builddir)/src/libgts.la -lm
 DEPS = $(top_builddir)/src/libgts.la
diff -ur gts-0.7.6.orig/tools/Makefile.in gts-0.7.6/tools/Makefile.in
--- gts-0.7.6.orig/tools/Makefile.in	2006-03-10 01:31:07.000000000 +0100
+++ gts-0.7.6/tools/Makefile.in	2006-05-19 14:30:38.000000000 +0200
@@ -221,7 +221,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src\
 	 -DG_LOG_DOMAIN=\"Gts-tools\"
 
 LDADD = $(top_builddir)/src/libgts.la -lm


--- NEW FILE gts.spec ---
Name:           gts
Version:        0.7.6
Release:        4%{?dist}
Summary:        GNU Triangulated Surface Library
Group:          Applications/Engineering
License:        LGPL
URL:            http://gts.sourceforge.net/index.html
Source0:        http://prdownloads.sourceforge.net/gts/gts-0.7.6.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:         gts-0.7.6-includedir.diff
Patch1:         gts-0.7.6-gts_config.diff

BuildRequires:  glib2-devel

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

%description
GTS provides a set of useful functions to deal with 3D surfaces meshed
with interconnected triangles including collision detection,
multiresolution models, constrained Delaunay triangulations and robust
set operations (union, intersection, differences).

%description devel
This package contains the gts header files and libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
mv -f $RPM_BUILD_ROOT%{_bindir}/delaunay $RPM_BUILD_ROOT%{_bindir}/gtsdelaunay 
mv -f $RPM_BUILD_ROOT%{_bindir}/happrox $RPM_BUILD_ROOT%{_bindir}/gtshapprox
mv -f $RPM_BUILD_ROOT%{_bindir}/transform $RPM_BUILD_ROOT%{_bindir}/gtstransform

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/gtsdelaunay
%{_bindir}/gts2dxf
%{_bindir}/gts2oogl
%{_bindir}/gts2stl
%{_bindir}/gtscheck
%{_bindir}/gtscompare
%{_bindir}/gtstemplate
%{_bindir}/gtshapprox
%{_bindir}/stl2gts
%{_bindir}/gtstransform
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_bindir}/gts-config
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%{_datadir}/aclocal/*

%changelog
* Sun May 21 2006 Ed Hill <ed at eh3.com> - 0.7.6-4
- add gts-config patch

* Sun May 21 2006 Ed Hill <ed at eh3.com> - 0.7.6-3
- add Ralf's includedir patch

* Fri May 19 2006 Ed Hill <ed at eh3.com> - 0.7.6-2
- fix FE review items provided by Ralf Corsepius

* Thu May 18 2006 Ed Hill <ed at eh3.com> - 0.7.6-1
- initial package creation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 May 2006 20:26:33 -0000	1.1
+++ .cvsignore	21 May 2006 20:27:23 -0000	1.2
@@ -0,0 +1 @@
+gts-0.7.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 May 2006 20:26:33 -0000	1.1
+++ sources	21 May 2006 20:27:23 -0000	1.2
@@ -0,0 +1 @@
+9f710aefd2ed9b3cc1b1216171fc5a8a  gts-0.7.6.tar.gz

More information about the fedora-extras-commits mailing list