rpms/libgeda/FC-5 libgeda-20060906-arc.patch, NONE, 1.1 libgeda-20060906-configure.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libgeda.spec, 1.2, 1.3 sources, 1.3, 1.4 libgeda-20060824-arc.patch, 1.1, NONE libgeda-20060824-configure.patch, 1.1, NONE

Chitlesh GOORAH (chitlesh) fedora-extras-commits at redhat.com
Sun Sep 10 21:20:03 UTC 2006


Author: chitlesh

Update of /cvs/extras/rpms/libgeda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16982/FC-5

Modified Files:
	.cvsignore libgeda.spec sources 
Added Files:
	libgeda-20060906-arc.patch libgeda-20060906-configure.patch 
Removed Files:
	libgeda-20060824-arc.patch libgeda-20060824-configure.patch 
Log Message:
auto-import libgeda-20060906-1 on branch FC-5 from libgeda-20060906-1.src.rpm

libgeda-20060906-arc.patch:

--- NEW FILE libgeda-20060906-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-20060906-configure.patch:

--- NEW FILE libgeda-20060906-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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2006 18:01:59 -0000	1.3
+++ .cvsignore	10 Sep 2006 21:20:03 -0000	1.4
@@ -1 +1 @@
-libgeda-20060824.tar.gz
+libgeda-20060906.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/libgeda.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgeda.spec	4 Sep 2006 18:01:59 -0000	1.2
+++ libgeda.spec	10 Sep 2006 21:20:03 -0000	1.3
@@ -1,21 +1,21 @@
-Name:       libgeda
-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/%{version}/%{name}-%{version}.tar.gz
-Patch0:     libgeda-20060824-arc.patch
-Patch1:     libgeda-20060824-configure.patch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:            libgeda
+Version:         20060906
+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/%{version}/%{name}-%{version}.tar.gz
+Patch0:          %{name}-%{version}-arc.patch
+Patch1:          %{name}-%{version}-configure.patch
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:  gtk2-devel, guile-devel, autoconf, gd-devel
+BuildRequires:   gtk2-devel, guile-devel, autoconf, gd-devel
 
 %description
 This package contains libgeda, the library needed by gEDA applications.
@@ -33,10 +33,10 @@
 
 
 %package devel
-Summary:    Development files for the libgeda library
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   guile-devel, gtk2-devel, gd-devel
+Summary:         Development files for the libgeda library
+Group:           Development/Libraries
+Requires:        %{name} = %{version}-%{release}
+Requires:        guile-devel, gtk2-devel, gd-devel
 
 %description devel
 Development files for libgeda library
@@ -68,7 +68,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %files
@@ -93,6 +93,9 @@
 
 
 %Changelog
+* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
+- Upstream release 20060906
+
 * Mon Sep 04 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-1
 - Upstream release 20060824
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2006 18:01:59 -0000	1.3
+++ sources	10 Sep 2006 21:20:03 -0000	1.4
@@ -1 +1 @@
-1c91d97f6f2f83695af36aeb5e830e0b  libgeda-20060824.tar.gz
+1199ba6a71f3c03081a82e19fa550bc3  libgeda-20060906.tar.gz


--- libgeda-20060824-arc.patch DELETED ---


--- libgeda-20060824-configure.patch DELETED ---




More information about the scm-commits mailing list