[pcb/f14/master] 20100929

[Chitlesh GOORAH]

commit 7837d48054000c5026267381d2ad845703a710e4
Author: Chitlesh Goorah <chitlesh at fedoraproject.org>
Date:   Sat Oct 2 20:21:47 2010 +0200

    20100929

 .gitignore                                         |    1 +
 ...ome-warnings-suggested-by-Stefan-Salewski.patch |  304 --------------------
 pcb-0.20091103-example.patch                       |   66 -----
 pcb-0.20091103-tools.patch                         |   13 -
 pcb.spec                                           |   34 +--
 sources                                            |    3 +-
 6 files changed, 14 insertions(+), 407 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bafdfef..6543e7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pcb-20091103.tar.gz
 pcb-reference-card.pdf
+/pcb-20100929.tar.gz
diff --git a/pcb.spec b/pcb.spec
index 6a55fac..10e52d4 100644
--- a/pcb.spec
+++ b/pcb.spec
@@ -1,8 +1,8 @@
-%global         pcbver    20091103
+%global         pcbver    20100929
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        2%{?dist}
+Release:        1%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -18,11 +18,7 @@ Requires:       m4
 Requires:       electronics-menu
 
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
-Source1:        pcb-reference-card.pdf
-Patch0:         pcb-0.20091103-tools.patch
-Patch1:         pcb-0.20091103-example.patch
-# Upstream's patch
-Patch2:         0001-fix-some-warnings-suggested-by-Stefan-Salewski.patch
+
 
 %description
 PCB is an interactive printed circuit board editor.
@@ -48,19 +44,6 @@ board editor.
 %prep
 %setup -q -n %{name}-%{pcbver}
 
-# Removes duplicates
-%patch0 -p0 -b .duplicates
-
-%patch2 -p1 -b .upstream
-
-#
-# Preparing docs for %%doc
-#
-
-# renaming to .pcb extension
-mv example/LED  example/LED.pcb
-mv example/LED2 example/LED2.pcb
-%patch1 -p0 -b .examples
 %{__sed} -i \
    's|examplesdir = $(pkgdatadir)/examples|examplesdir = @docdir@/examples|' \
    example/libraries/Makefile.*
@@ -82,6 +65,7 @@ export CFLAGS=`echo %optflags | sed "s/-D_FORTIFY_SOURCE=2 // g" -`
 # Bug 544657 : --enable-dbus
 %configure \
     --enable-dbus \
+    --enable-toporouter \
     --disable-update-mime-database \
     --disable-update-desktop-database \
     --docdir=%{_docdir}/%{name}-%{version}
@@ -142,8 +126,10 @@ cp -p AUTHORS COPYING README NEWS ChangeLog README_FILES/CHANGES \
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
-%{__rm} -f  %{buildroot}%{_docdir}/%{name}-%{version}/refcard*
-cp -p %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}
+mv doc/refcard.pdf %{buildroot}%{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
+
+# remove duplicates
+%{__rm} -f %{buildroot}%{_bindir}/Merge*
 
 
 # locale's
@@ -212,9 +198,13 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/mime/packages/pcb.xml
 %{_datadir}/mimelnk/application/x-*.desktop
+%{_datadir}/gEDA/scheme/gnet-pcbfwd.scm
 
 
 %changelog
+* Sat Oct 2 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20100929-1
+- New upstream release
+
 * Sun Dec 6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-2
 - Enable build for dbus support
 - improved reference card
diff --git a/sources b/sources
index fd25ace..56f184a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-659a13bffd2269d3a0f86508a7c1531b  pcb-20091103.tar.gz
-2992aa741c184f615f2571ed2c6b3295  pcb-reference-card.pdf
+4c71f5d1c40ad65539957748b88eb863  pcb-20100929.tar.gz