rpms/libgeda/devel libgeda-20060123-arc.patch, NONE, 1.1 libgeda-20060123-configure.patch, NONE, 1.1 libgeda.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Chitlesh GOORAH (chitlesh) fedora-extras-commits at redhat.com
Wed Aug 30 16:04:25 UTC 2006


Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	libgeda-20060123-arc.patch libgeda-20060123-configure.patch 
	libgeda.spec 
Log Message:
auto-import libgeda-20060123-6 on branch devel from libgeda-20060123-6.src.rpm

libgeda-20060123-arc.patch:

--- NEW FILE libgeda-20060123-arc.patch ---
--- src/o_arc_basic.c	2006-01-24 04:20:50.000000000 +0100
+++ o_arc_basic.c	2006-08-29 14:21:11.000000000 +0200
@@ -1286,7 +1286,8 @@
 						o_current->line_width));
 
   gdImageArc(current_im_ptr,
-	     x, y, width, height, start_angle, end_angle, color);
+	     x, y, width, height, 720 - end_angle, 720 -
+start_angle, color);
 #endif
 
 }

libgeda-20060123-configure.patch:

--- NEW FILE libgeda-20060123-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


--- NEW FILE libgeda.spec ---
Name:       libgeda
Version:    20060123
Release:    6%{?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
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

%description
This package contains libgeda, the library needed by gEDA applications.


%package doc
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
info format.


%package 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


%prep
%setup -q
%patch0 -p0 -b o_arc_basic.c
%patch1 -p0 -b configure.ac

%build

autoconf
for f in `find . -name \*.c -or -name \*.h` ; do
   sed -i -e 's|gdgeda/gd.h|gd.h|' $f
done

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

%install
%{__rm} -rf %{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

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_libdir}/libgeda.so.*


%files devel
%defattr(-,root,root,-)
%doc AUTHORS BUGS HACKING TODO
%{_includedir}/libgeda
%{_libdir}/libgeda.so
%{_libdir}/pkgconfig/libgeda.pc


%files doc
%defattr(-, root, root, -)
%doc docs/*
%{_infodir}/libgedadoc*


%Changelog
* Wed Aug 30 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-6
- Fixed useless BR

* Tue Aug 29 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-5
- patches replaced by bash commands

* Tue Aug 29 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-4
- Fixed BR for -devel package
- Added patches to make use of gd instead of ligdgeda
- Added the doc package

* Fri Aug 25 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-3
- packaging for FC5 and later
- added texi2html as BR to set HTML file creation enabled
- opting for gd-devel prior to libgdgeda-devel as BR
- Removed %%{_infodir}/dir

* Wed Feb 22 2006 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20060123-2.fc4
- more cleanup

* Fri Jan 27 2006 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20060123-1.fc4
- updated to version 20060123 - libgeda.so.25.0.0

* Sun Jan 1 2006 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20050820-2.fc4
- specfile cleanup

* Wed Aug 24 2005 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20050820-1.fc4
- updated to version 20050820

* Tue Jun 28 2005 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20050313-1.fc4
- rebuilt for Fedora Core 4

* Tue Mar 14 2005 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20050313-1.fc3.wk
- updated to version 20050313 - libgeda.so.23.0.0

* Wed Dec 28 2004 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20041228-1.fc3.wk
- updated to version 20041228 - libgeda.so.22.0.0,

* Sun Dec 12 2004 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20040111-1.fc3.wk
- rebuilt for Fedora Core 3

* Wed Jan 14 2004 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20040111-1
- updated to version 20040111 - libgeda.so.20.0.0,
- built on Fedora Core 1
- modified specfile

* Thu Sep 4 2003 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20030901-1
- updated to version 20030901 - libgeda.so.19.0.0

* Wed May 28 2003 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20030525-1
- updated to version 20030525, compiled on RedHat 9

* Tue Feb 25 2003 Wojciech Kazubski <wk at ire.pw.edu.pl> - 200302223-2
- updated to version 20030223 - libgeda.so.18.0.0

* Fri Nov 8 2002 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20021103-1
- updated to version 20021103, compiled on RedHat 8.0

* Wed Sep 4 2002 Wojciech Kazubski <wk at ire.pw.edu.pl> -20020825-1
- updated to version 20020825

* Sat Jun 1 2002 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20020527-1
- updated to version 20020527

* Wed Feb 13 2002 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20020209-1
- updated to version 20020209 - libgeda.so.15.0.0
- info files added
- split into libgeda and libgeda-devel

* Tue Nov 27 2001 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20010722-2
- some corrections

* Thu Aug 3 2001 Wojciech Kazubski <wk at ire.pw.edu.pl> - 20010722-1
- updated to version 20010722; built on redhat-7.0

* Sun Mar 11 2001 L.J.H. Timmerman <bert.timmerman at corusgroup.com>
- updated to version 20010304; built on redhat-7.0

* Thu Aug 10 2000 Emmanuel Rouat <emmanuel.rouat at wanadoo.fr>
- rebuild with new version of rpm (shouldn't change anything)

* Thu Jul  6 2000 Emmanuel Rouat <emmanuel.rouat at wanadoo.fr>
- updated to version 20000704
- changed licence from LGPL to GPL

* Wed Feb 23 2000 Emmanuel Rouat <emmanuel.rouat at wanadoo.fr>
- removed 'Redhat Contrib Net' stuff
- updated to version 20000220

* Thu Oct 14 1999 Emmanuel Rouat <emmanuel.rouat at wanadoo.fr>
- updated to version 19991011

* Wed Sep 22 1999 Emmanuel Rouat <emmanuel.rouat at wanadoo.fr>
- updated to version 19990919

* Wed Sep  1 1999 Emmanuel Rouat <emmanuel.rouat at wanadoo.fr>
- updated to version 19990829

* Mon Jul 19 1999 Emmanuel Rouat <emmanuel.rouat at wanadoo.fr>
- Group is now System Environment/Libraries
- rebuild with libgdgeda

* Sat Jul 10 1999 Emmanuel Rouat <emmanuel.rouat at wanadoo.fr>
- initialization of spec file.

# end of file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Aug 2006 16:01:58 -0000	1.1
+++ .cvsignore	30 Aug 2006 16:04:25 -0000	1.2
@@ -0,0 +1 @@
+libgeda-20060123.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Aug 2006 16:01:58 -0000	1.1
+++ sources	30 Aug 2006 16:04:25 -0000	1.2
@@ -0,0 +1 @@
+fa159b269c8c1d3d248dc39d4b70f366  libgeda-20060123.tar.gz




More information about the fedora-extras-commits mailing list