rpms/libscigraphica/devel libscigraphica-configure-fix.patch, NONE, 1.1 libscigraphica.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Deji Akingunola (deji)
fedora-extras-commits at redhat.com
Mon Jan 29 03:59:42 UTC 2007
Author: deji
Update of /cvs/extras/rpms/libscigraphica/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23450/devel
Modified Files:
.cvsignore sources
Added Files:
libscigraphica-configure-fix.patch libscigraphica.spec
Log Message:
auto-import libscigraphica-2.1.1-6 on branch devel from libscigraphica-2.1.1-6.src.rpm
libscigraphica-configure-fix.patch:
--- NEW FILE libscigraphica-configure-fix.patch ---
--- configure.in 2005-06-24 21:38:20.000000000 -0400
+++ configure.in.new 2007-01-01 14:16:34.000000000 -0500
@@ -57,9 +57,6 @@
# Build time sanity check...
AM_SANITY_CHECK
-/* print extra warning messages when compiling CVS */
-test "`echo ${SG_VERSION} || grep -i cvs`" && CFLAGS="$CFLAGS -g -O -W -Wall -DWITH_WARNINGS"
-
# Checks for programs.
AC_PROG_CC
@@ -222,16 +219,16 @@
PKG_CHECK_MODULES(GTK_EXTRA, gtkextra-2.0 >= 2.1.0)
-AC_CHECK_PROG(libart_config_found,libart-config, yes,no)
-AC_CHECK_LIB(art_lgpl, art_pixbuf_new_rgb,
+AC_CHECK_PROG(libart_config_found,libart2-config, yes,no)
+AC_CHECK_LIB(art_lgpl_2, art_pixbuf_new_rgb,
[libart_found=yes],
AC_MSG_RESULT(Cannot find LIBART, disabling anti-aliasing))
if eval "test x$libart_found != xno && test x$libart_config_found != xno"; then
- LIBART_CFLAGS="`libart-config --cflags`"
+ LIBART_CFLAGS="`libart2-config --cflags`"
AC_SUBST(LIBART_CFLAGS)
CFLAGS="$CFLAGS $LIBART_CFLAGS -DWITH_LIBART"
- LIBART_LIBS="`libart-config --libs`"
+ LIBART_LIBS="`libart2-config --libs`"
AC_SUBST(LIBART_LIBS)
LIBS="$LIBS $LIBART_LIBS"
fi
--- configure 2005-06-24 21:38:43.000000000 -0400
+++ configure.new 2007-01-01 14:12:43.000000000 -0500
@@ -1935,9 +1935,6 @@
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
-/* print extra warning messages when compiling CVS */
-test "`echo ${SG_VERSION} || grep -i cvs`" && CFLAGS="$CFLAGS -g -O -W -Wall -DWITH_WARNINGS"
-
# Checks for programs.
ac_ext=c
@@ -10015,7 +10012,7 @@
# Extract the first word of "libart-config", so it can be a program name with args.
-set dummy libart-config; ac_word=$2
+set dummy libart2-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_libart_config_found+set}" = set; then
@@ -10050,13 +10047,13 @@
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:$LINENO: checking for art_pixbuf_new_rgb in -lart_lgpl" >&5
-echo $ECHO_N "checking for art_pixbuf_new_rgb in -lart_lgpl... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for art_pixbuf_new_rgb in -lart_lgpl_2" >&5
+echo $ECHO_N "checking for art_pixbuf_new_rgb in -lart_lgpl_2... $ECHO_C" >&6
if test "${ac_cv_lib_art_lgpl_art_pixbuf_new_rgb+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lart_lgpl $LIBS"
+LIBS="-lart_lgpl_2 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -10113,10 +10110,10 @@
if eval "test x$libart_found != xno && test x$libart_config_found != xno"; then
- LIBART_CFLAGS="`libart-config --cflags`"
+ LIBART_CFLAGS="`libart2-config --cflags`"
CFLAGS="$CFLAGS $LIBART_CFLAGS -DWITH_LIBART"
- LIBART_LIBS="`libart-config --libs`"
+ LIBART_LIBS="`libart2-config --libs`"
LIBS="$LIBS $LIBART_LIBS"
fi
--- NEW FILE libscigraphica.spec ---
%{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
Summary: A library of gtk+ widgets for SciGraphica
Name: libscigraphica
Version: 2.1.1
Release: 6%{?dist}
License: GPL
Group: System Environment/Libraries
Url: http://scigraphica.sourceforge.net
Source: http://dl.sourceforge.net/scigraphica/%{name}-%{version}.tar.gz
Patch0: libscigraphica-configure-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+extra-devel libxml2-devel
BuildRequires: libart_lgpl-devel
BuildRequires: python-devel python-numeric
BuildRequires: gettext perl(XML::Parser)
%description
A library of gtk+ widgets for SciGraphica. SciGraphica is a free (GPL)
scientific application for data analysis and technical graphics
%package devel
Summary: Development files for SciGraphica
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig automake
Requires: gtk+extra-devel
%description devel
This package includes the library and header files for compiling programs
that use libscigraphica
%prep
%setup -q
%patch0 -p0 -b .fix
%build
%configure --disable-static --with-python-numeric-path=%{python_siteinc}/Numeric
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog TODO
%{_libdir}/%{name}*.so.*
%{_libdir}/scigraphica/
%dir %{_datadir}/pixmaps/%{name}
%{_datadir}/pixmaps/*.xpm
%{_datadir}/pixmaps/%{name}/*.xpm
%files devel
%defattr(-,root,root,-)
%{_includedir}/scigraphica-2.0/
%{_libdir}/%{name}*.so
%{_datadir}/aclocal/%{name}-2.0.m4
%{_libdir}/pkgconfig/%{name}-2.0.pc
%{_datadir}/pixmaps/%{name}/*.h
%changelog
* Mon Jan 02 2007 Deji Akingunola <dakingun at gmail.com> - 2.1.1-6
- Make the package own $(datadir)/pixmaps/$(name)
* Mon Jan 01 2007 Deji Akingunola <dakingun at gmail.com> - 2.1.1-5
- Patch out build flags that were actually meant for CVS builds
- Specify python-numeric path to avoid collisions with python-numarray
* Mon Jan 01 2007 Deji Akingunola <dakingun at gmail.com> - 2.1.1-4
- Make the -devel subpackage require gtk+extras
- Move the .m4 file to the -devel subpackage
* Fri Dec 29 2006 Deji Akingunola <dakingun at gmail.com> - 2.1.1-3
- Fix sloppy editing in the release and require tags
* Fri Dec 29 2006 Deji Akingunola <dakingun at gmail.com> - 2.1.1-2
- Require pkgconfig for the devel sub-package
- Properly requires the main package by the -devel subpackage
* Sat Dec 09 2006 Deji Akingunola <dakingun at gmail.com> - 2.1.1-1
- Initial build for Fedora Extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libscigraphica/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 29 Jan 2007 03:58:48 -0000 1.1
+++ .cvsignore 29 Jan 2007 03:59:12 -0000 1.2
@@ -0,0 +1 @@
+libscigraphica-2.1.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libscigraphica/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 29 Jan 2007 03:58:48 -0000 1.1
+++ sources 29 Jan 2007 03:59:12 -0000 1.2
@@ -0,0 +1 @@
+1966786bcc8c47036e35777cbda422c3 libscigraphica-2.1.1.tar.gz
More information about the fedora-extras-commits
mailing list