rpms/libgeda/FC-5 libgeda-20060824-arc.patch, NONE, 1.1 libgeda-20060824-configure.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libgeda.spec, 1.1, 1.2 sources, 1.2, 1.3 libgeda-20060123-arc.patch, 1.1, NONE libgeda-20060123-configure.patch, 1.1, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Mon Sep 4 18:01:59 UTC 2006
Author: chitlesh
Update of /cvs/extras/rpms/libgeda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13086/FC-5
Modified Files:
.cvsignore libgeda.spec sources
Added Files:
libgeda-20060824-arc.patch libgeda-20060824-configure.patch
Removed Files:
libgeda-20060123-arc.patch libgeda-20060123-configure.patch
Log Message:
auto-import libgeda-20060824-1 on branch FC-5 from libgeda-20060824-1.src.rpm
libgeda-20060824-arc.patch:
--- NEW FILE libgeda-20060824-arc.patch ---
--- src/o_arc_basic.c 2006-07-06 01:04:58.000000000 +0200
+++ o_arc_basic.c 2006-09-04 18:46:08.000000000 +0200
@@ -1630,7 +1630,7 @@
o_current->line_width));
gdImageArc(current_im_ptr,
- x, y, width, height, start_angle, end_angle, color);
+ x, y, width, height, 700 - start_angle, 700 - end_angle, color);
#endif
}
libgeda-20060824-configure.patch:
--- NEW FILE libgeda-20060824-configure.patch ---
--- libgeda-20060123/configure.ac 2006-08-29 13:15:09.000000000 +0200
+++ configure.ac 2006-08-29 14:32:29.000000000 +0200
@@ -21,8 +21,8 @@
#########################################################################
# Command line flags start
#
-# --disable-gdgeda : turn off libgdgeda support
-AC_ARG_ENABLE(gdgeda, [ --disable-gdgeda Disable libgdgeda support (don't use libgdgeda at all)],
+# --disable-gdgeda : turn off gd support
+AC_ARG_ENABLE(gdgeda, [ --disable-gdgeda Disable gd support (don't use gd at all)],
[ if test $enableval = "no"; then no_gdgeda=yes; fi ])
# Change default location for rc files
@@ -146,9 +146,9 @@
############################################################################
############################################################################
-# Check for libgdgeda start
-#
-AC_PATH_PROG(LIBGDGEDACONFIG, libgdgeda-config, no, ${PATH})
+# Check for gd start
+#
+AC_PATH_PROG(LIBGDGEDACONFIG, gdlib-config, no, ${PATH})
if test "$LIBGDGEDACONFIG" = "no"
then
@@ -159,7 +159,7 @@
else
if test "$no_gdgeda" = "yes"
then
- echo found libgdgeda, but disabling gdgeda support.
+ echo found gd, but disabling gd support.
GDGEDA_CFLAGS=
GDGEDA_LIBS=
GDGEDA_VERSION=
@@ -173,14 +173,14 @@
GDGEDA="yes"
# This is not really used to figure out paths, but just to make
- # sure >= 2.0.15 is installed
- PKG_CHECK_MODULES(libgdgeda, libgdgeda >= 2.0.15)
- AC_DEFINE(HAS_LIBGDGEDA, 1, [If libgdgeda has been installed, define this])
+ # PKG_CHECK_MODULES(gd, gd >= 2.0.15)
+ GDGEDA_LIBS="-lgd $GDGEDA_LIBS"
+ AC_DEFINE(HAS_LIBGDGEDA, 1, [If gd has been installed,define this])
fi
fi
#
-# Check for libgdgeda end
+# Check for gd end
############################################################################
############################################################################
@@ -628,7 +628,7 @@
GLIB library version: $GLIB_VERSION
GTK+ library version: $GTK_VERSION
GUILE library version: $GUILE_VERSION
- libgdgeda (png output): $GDGEDA $GDGEDA_VERSION
+ gd (png output): $GDGEDA $GDGEDA_VERSION
mingw build: $MINGW
data directory: $expandedGEDADATADIR
rc directory: $expandedGEDARCDIR
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 Aug 2006 16:04:25 -0000 1.2
+++ .cvsignore 4 Sep 2006 18:01:59 -0000 1.3
@@ -1 +1 @@
-libgeda-20060123.tar.gz
+libgeda-20060824.tar.gz
Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/libgeda.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgeda.spec 30 Aug 2006 16:04:25 -0000 1.1
+++ libgeda.spec 4 Sep 2006 18:01:59 -0000 1.2
@@ -1,15 +1,15 @@
Name: libgeda
-Version: 20060123
-Release: 6%{?dist}
+Version: 20060824
+Release: 1%{?dist}
Summary: Libraries for the gEDA project
Group: System Environment/Libraries
License: GPL
URL: http://www.geda.seul.org
-Source: ftp://ftp.geda.seul.org/pub/geda/devel/20060123/libgeda-20060123.tar.gz
-Patch0: libgeda-20060123-arc.patch
-Patch1: libgeda-20060123-configure.patch
+Source: ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz
+Patch0: libgeda-20060824-arc.patch
+Patch1: libgeda-20060824-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/ldconfig
@@ -25,8 +25,7 @@
Summary: Documentation for libgeda, Libraries for the gEDA project
Group: Documentation
Requires: %{name} = %{version}-%{release}
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+
%description doc
This package contains the documentation of pcb in html, pdf, postscript and
@@ -56,23 +55,15 @@
done
%configure --disable-static
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot}
%{__rm} -f %{buildroot}%{_infodir}/dir
%{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -rf docs/Makefile*
-%post doc
-/sbin/install-info %{_infodir}/libgedadoc.info.gz %{_infodir}/dir
-
-%preun doc
-if [ $1 = 0 ]; then
- /sbin/install-info --delete %{_infodir}/libgedadoc.info.gz %{_infodir}/dir
-fi
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -97,10 +88,14 @@
%files doc
%defattr(-, root, root, -)
%doc docs/*
-%{_infodir}/libgedadoc*
+%{_datadir}/gEDA/prolog.ps
+
%Changelog
+* Mon Sep 04 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-1
+- Upstream release 20060824
+
* Wed Aug 30 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-6
- Fixed useless BR
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 Aug 2006 16:04:25 -0000 1.2
+++ sources 4 Sep 2006 18:01:59 -0000 1.3
@@ -1 +1 @@
-fa159b269c8c1d3d248dc39d4b70f366 libgeda-20060123.tar.gz
+1c91d97f6f2f83695af36aeb5e830e0b libgeda-20060824.tar.gz
--- libgeda-20060123-arc.patch DELETED ---
--- libgeda-20060123-configure.patch DELETED ---
More information about the scm-commits
mailing list