diff --git a/.cvsignore b/.cvsignore
index cef80f8..cfc345e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pcb-20081128.tar.gz
+pcb-20091103.tar.gz
diff --git a/0001-fix-some-warnings-suggested-by-Stefan-Salewski.patch b/0001-fix-some-warnings-suggested-by-Stefan-Salewski.patch
new file mode 100644
index 0000000..6e459f1
--- /dev/null
+++ b/0001-fix-some-warnings-suggested-by-Stefan-Salewski.patch
@@ -0,0 +1,304 @@
+From 63e4c3c10f5aad0aff4c5dd54f227d137697a8b9 Mon Sep 17 00:00:00 2001
+From: Ineiev <ineiev@users.berlios.de>
+Date: Sat, 7 Nov 2009 15:25:27 +0000
+Subject: [PATCH] fix some warnings suggested by Stefan Salewski
+
+---
+ src/autoroute.c              |    2 ++
+ src/djopt.c                  |    2 +-
+ src/draw.c                   |    4 ++--
+ src/file.c                   |   35 +++++++++++++++++++++++++++++------
+ src/hid.h                    |    2 +-
+ src/hid/common/actions.c     |    5 +++--
+ src/hid/common/hidnogui.c    |    9 ++++++---
+ src/hid/gtk/gui-dialog.c     |    4 +++-
+ src/hid/gtk/gui-top-window.c |    2 +-
+ src/report.c                 |    1 +
+ src/rtree.c                  |    4 +++-
+ 11 files changed, 52 insertions(+), 18 deletions(-)
+
+diff --git a/src/autoroute.c b/src/autoroute.c
+index b9f1fdd..730eab5 100644
+--- a/src/autoroute.c
++++ b/src/autoroute.c
+@@ -3426,6 +3426,7 @@ RD_DrawManhattanLine (routedata_t * rd,
+   return (knee.X != end.X);
+ }
+ 
++#if 0
+ /* for smoothing, don't pack traces to min clearance gratuitously */
+ static void
+ add_clearance (CheapPointType * nextpoint, const BoxType * b)
+@@ -3463,6 +3464,7 @@ add_clearance (CheapPointType * nextpoint, const BoxType * b)
+ 	nextpoint->Y = (b->Y1 + b->Y2) / 2;
+     }
+ }
++#endif
+ 
+ /* This back-traces the expansion boxes along the best path
+  * it draws the lines that will make the actual path.
+diff --git a/src/djopt.c b/src/djopt.c
+index 68b3641..382f987 100644
+--- a/src/djopt.c
++++ b/src/djopt.c
+@@ -2455,7 +2455,6 @@ dump_all ()
+ 	      (void *) l, (void *) (l->s), (void *) (l->e), l->layer);
+     }
+ }
+-#endif
+ 
+ static void
+ nudge_corner (corner_s * c, int dx, int dy, corner_s * prev_corner)
+@@ -2477,6 +2476,7 @@ nudge_corner (corner_s * c, int dx, int dy, corner_s * prev_corner)
+ 	nudge_corner (oc, 0, dy, c);
+     }
+ }
++#endif
+ 
+ static line_s *
+ choose_example_line (corner_s * c1, corner_s * c2)
+diff --git a/src/draw.c b/src/draw.c
+index 1d902b2..4130ea2 100644
+--- a/src/draw.c
++++ b/src/draw.c
+@@ -110,7 +110,7 @@ static void ClearPad (PadTypePtr, Boolean);
+ static void DrawHole (PinTypePtr);
+ static void DrawMask (BoxType *);
+ static void DrawRats (BoxType *);
+-static void DrawSilk (int, int, BoxType *);
++static void DrawSilk (int, int, BoxTypePtr);
+ static int pin_callback (const BoxType * b, void *cl);
+ static int pad_callback (const BoxType * b, void *cl);
+ 
+@@ -364,7 +364,7 @@ lowvia_callback (const BoxType * b, void *cl)
+  */
+ 
+ static void
+-PrintAssembly (const BoxType * drawn_area, int side_group, int swap_ident)
++PrintAssembly (BoxTypePtr drawn_area, int side_group, int swap_ident)
+ {
+   int save_swap = SWAP_IDENT;
+ 
+diff --git a/src/file.c b/src/file.c
+index db167c8..81296d5 100644
+--- a/src/file.c
++++ b/src/file.c
+@@ -1126,7 +1126,11 @@ ParseLibraryTree (void)
+        * start out in the working directory in case the path is a
+        * relative path 
+        */
+-      chdir (working);
++      if (chdir (working))
++        {
++	  Message (_("Can't change directory to `%s'))\n"), working);
++	  goto exit;
++	}
+ 
+       if ((dir = opendir (path)) == NULL)
+ 	{
+@@ -1139,13 +1143,23 @@ ParseLibraryTree (void)
+        * and then extract that directory to ensure we have a full path
+        * name, not a relative path name.
+        */
+-      chdir (path);
++      if (chdir (path))
++        {
++	  Message (_("Can't change directory to `%s'))\n"), path);
++	  closedir (dir);
++	  goto exit;
++	}
+       GetWorkingDirectory (path);
+ 
+       /* read all entries */
+       while ((direntry = readdir (dir)) != NULL)
+ 	{
+-	  chdir (path);
++	  if (chdir (path))
++	    {
++	      Message (_("Can't change directory to `%s'))\n"), path);
++	      closedir (dir);
++	      goto exit;
++	    }
+ 	  /* find directories
+ 	   * ignore entries beginning with "." and CVS
+ 	   * directories as well as a few other specific 
+@@ -1163,7 +1177,14 @@ ParseLibraryTree (void)
+ 	      /* FIXME ? */
+ 	      menu->directory = strdup (pcb_basename (path));
+ 	      subdir = opendir (direntry->d_name);
+-	      chdir (direntry->d_name);
++	      if (chdir (direntry->d_name))
++		{
++		  Message (_("Can't change directory to `%s'))\n"),
++			   direntry->d_name);
++		  closedir (dir);
++		  closedir (subdir);
++		  goto exit;
++		}
+ 	      while (subdir && (e2 = readdir (subdir)))
+ 		{
+ 		  l = strlen (e2->d_name);
+@@ -1212,10 +1233,12 @@ ParseLibraryTree (void)
+ 	}
+       closedir (dir);
+     }
++exit:
+   free (libpaths);
+-
+   /* restore the original working directory */
+-  chdir (working);
++  if (chdir (working))
++    Message (_("Can't change directory to `%s'))\n"), working);
++
+   return n_footprints;
+ }
+ 
+diff --git a/src/hid.h b/src/hid.h
+index ee48b9f..46b1d03 100644
+--- a/src/hid.h
++++ b/src/hid.h
+@@ -95,7 +95,7 @@ extern "C"
+   /* Register a singe action associated with an action context. Makes
+      a copy of HID_Action.  Intended for plugins to register actions
+      with a hub callback. */
+-  extern void hid_register_action(const HID_Action *, void *);
++  extern void hid_register_action(HID_Action *, void *);
+ 
+   /* Deregister an action registered using hid_register_action().
+      Action context pointer is copied in the 2nd argument if it's not
+diff --git a/src/hid/common/actions.c b/src/hid/common/actions.c
+index 8678ad9..c6863e5 100644
+--- a/src/hid/common/actions.c
++++ b/src/hid/common/actions.c
+@@ -49,7 +49,8 @@ HID_ActionNode *hid_action_nodes = NULL;
+ void *hid_action_context = NULL;
+ 
+ static void
+-hid_register_actions_context (HID_Action * a, int n, void *context, int dynamic)
++hid_register_actions_context (HID_Action * a, int n,
++			      void *context, int dynamic)
+ {
+   HID_ActionNode *ha;
+ 
+@@ -83,7 +84,7 @@ hid_register_actions (HID_Action * a, int n)
+ }
+ 
+ void
+-hid_register_action (const HID_Action * a, void *context)
++hid_register_action (HID_Action * a, void *context)
+ {
+   hid_register_actions_context (a, 1, context, 1);
+ }
+diff --git a/src/hid/common/hidnogui.c b/src/hid/common/hidnogui.c
+index 4d6baa0..4a599eb 100644
+--- a/src/hid/common/hidnogui.c
++++ b/src/hid/common/hidnogui.c
+@@ -276,7 +276,8 @@ nogui_confirm_dialog (char *msg, ...)
+   int rv;
+   printf ("%s ? 0=cancel 1=ok : ", msg);
+   fflush (stdout);
+-  scanf ("%d", &rv);
++  if (1 != scanf ("%d", &rv))
++    return 0;
+   return rv;
+ }
+ 
+@@ -300,7 +301,8 @@ nogui_prompt_for (char *msg, char *default_string)
+     printf ("%s [%s] : ", msg, default_string);
+   else
+     printf ("%s : ", msg);
+-  fgets (buf, 1024, stdin);
++  if (NULL == fgets (buf, 1024, stdin))
++    buf[0] = 0;
+   if (buf[0] == 0 && default_string)
+     strcpy (buf, default_string);
+   return buf;
+@@ -318,7 +320,8 @@ nogui_fileselect (const char *title, const char *descr,
+     printf ("%s [%s] : ", title, default_file);
+   else
+     printf ("%s : ", title);
+-  fgets (buf, 1024, stdin);
++  if (NULL == fgets (buf, 1024, stdin))
++    buf[0] = 0;
+   if (buf[0] == 0 && default_file)
+     strcpy (buf, default_file);
+   return buf;
+diff --git a/src/hid/gtk/gui-dialog.c b/src/hid/gtk/gui-dialog.c
+index 32ec48e..af40e9a 100644
+--- a/src/hid/gtk/gui-dialog.c
++++ b/src/hid/gtk/gui-dialog.c
+@@ -97,6 +97,7 @@ ghid_dialog_about (void)
+ 				   | GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				   GTK_MESSAGE_INFO,
+ 				   GTK_BUTTONS_OK,
++				   "%s",
+ 				   GetInfoString ()
+ 				   );
+ 
+@@ -142,6 +143,7 @@ ghid_dialog_message (gchar * message)
+ 				   GTK_DIALOG_MODAL |
+ 				   GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				   GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
++				   "%s",
+ 				   message);
+ 
+   gtk_dialog_run (GTK_DIALOG (dialog));
+@@ -169,7 +171,7 @@ ghid_dialog_confirm (gchar * message, gchar * cancelmsg, gchar * okmsg)
+ 				   GTK_DIALOG_MODAL |
+ 				   GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				   GTK_MESSAGE_QUESTION,
+-				   GTK_BUTTONS_NONE, message);
++				   GTK_BUTTONS_NONE, "%s", message);
+   gtk_dialog_add_buttons (GTK_DIALOG (dialog), 
+ 			  cancelmsg, GTK_RESPONSE_CANCEL,
+ 			  okmsg, GTK_RESPONSE_OK,
+diff --git a/src/hid/gtk/gui-top-window.c b/src/hid/gtk/gui-top-window.c
+index b950a25..c67f7dc 100644
+--- a/src/hid/gtk/gui-top-window.c
++++ b/src/hid/gtk/gui-top-window.c
+@@ -2509,7 +2509,7 @@ ghid_create_pcb_widgets (void)
+     ghidgui->bg_pixbuf = gdk_pixbuf_new_from_file(bg_image_file, &err);
+   if (err)
+     {
+-    g_error(err->message);
++    g_error("%s", err->message);
+     g_error_free(err);
+     }
+   ghid_build_pcb_top_window ();
+diff --git a/src/report.c b/src/report.c
+index 974c0be..00b1ee6 100644
+--- a/src/report.c
++++ b/src/report.c
+@@ -677,6 +677,7 @@ ReportAllNetLengths (int argc, char **argv, int x, int y)
+ 	  break;
+ 	}
+     }
++  return 0;
+ }
+ 
+ static int
+diff --git a/src/rtree.c b/src/rtree.c
+index f7ffe4d..1d5e2d4 100644
+--- a/src/rtree.c
++++ b/src/rtree.c
+@@ -105,6 +105,7 @@ struct rtree_node
+ };
+ 
+ #ifdef SLOW_ASSERTS
++#ifndef NDEBUG
+ static int
+ __r_node_is_good (struct rtree_node *node)
+ {
+@@ -217,7 +218,8 @@ __r_tree_is_good (struct rtree_node *node)
+     }
+   return 1;
+ }
+-#endif
++#endif /* !defined NDEBUG */
++#endif /* defined SLOW_ASSERTS */
+ #ifndef NDEBUG
+ /* print out the tree */
+ void
+-- 
+1.6.5.2
+
diff --git a/import.log b/import.log
index 5e0e735..4aef0b6 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 pcb-0_20081128-1_fc10:HEAD:pcb-0.20081128-1.fc10.src.rpm:1227992246
 pcb-0_20081128-4_fc11:HEAD:pcb-0.20081128-4.fc11.src.rpm:1252486375
+pcb-0_20091103-1_fc12:HEAD:pcb-0.20091103-1.fc12.src.rpm:1257626120
diff --git a/pcb-0.20091103-example.patch b/pcb-0.20091103-example.patch
new file mode 100644
index 0000000..2f7588c
--- /dev/null
+++ b/pcb-0.20091103-example.patch
@@ -0,0 +1,66 @@
+--- example/Makefile.am	2009-02-02 22:57:31.000000000 +0100
++++ Makefile.am_examples	2009-11-07 11:58:06.394857188 +0100
+@@ -1,6 +1,6 @@
+ ## $Id: pcb-0.20091103-example.patch,v 1.1 2009/11/07 20:36:15 chitlesh Exp $
+ 
+-examplesdir=	$(pkgdatadir)/examples
++examplesdir=	@docdir@/examples
+ examples_DATA=	${EXAMPLES}
+ 
+ SUBDIRS=	libraries
+@@ -8,7 +8,7 @@
+ EXTRA_DIST=	${EXAMPLES}
+ 
+ EXAMPLES=\
+-	LED \
++	LED.pcb \
+ 	LED.NET \
+-	LED2
++	LED2.pcb
+ 
+--- example/Makefile.in	2009-11-04 00:05:40.000000000 +0100
++++ Makefile.in_example	2009-11-07 12:31:56.423855610 +0100
+@@ -276,14 +276,14 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-examplesdir = $(pkgdatadir)/examples
++examplesdir = @docdir@/examples
+ examples_DATA = ${EXAMPLES}
+ SUBDIRS = libraries
+ EXTRA_DIST = ${EXAMPLES}
+ EXAMPLES = \
+-	LED \
++	LED.pcb \
+ 	LED.NET \
+-	LED2
++	LED2.pcb
+ 
+ all: all-recursive
+ 
+@@ -319,20 +319,20 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-examplesDATA: $(examples_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
++	test -z "$(examplesdir)/LED_Interface" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)/LED_Interface"
+ 	@list='$(examples_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(examplesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(examplesdir)/$$f'"; \
+-	  $(examplesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(examplesdir)/$$f"; \
++	  echo " $(examplesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(examplesdir)/LED_Interface/$$f'"; \
++	  $(examplesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(examplesdir)/LED_Interface/$$f"; \
+ 	done
+ 
+ uninstall-examplesDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(examples_DATA)'; for p in $$list; do \
+ 	  f=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(examplesdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(examplesdir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(examplesdir)/LED_Interface/$$f'"; \
++	  rm -f "$(DESTDIR)$(examplesdir)/LED_Interface/$$f"; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
diff --git a/pcb-0.20091103-tools.patch b/pcb-0.20091103-tools.patch
new file mode 100644
index 0000000..6bfcd39
--- /dev/null
+++ b/pcb-0.20091103-tools.patch
@@ -0,0 +1,13 @@
+--- tools/Makefile.in	2009-11-04 00:06:38.000000000 +0100
++++ Makefile.in_tools	2009-11-07 11:35:25.062856727 +0100
+@@ -270,9 +270,7 @@
+ toolsdir = $(pkgdatadir)/tools
+ tools_DATA = ${TOOLS}
+ EXTRA_DIST = ${TOOLS}
+-bin_SCRIPTS = \
+-	MergePCBPS \
+-	Merge_dimPCBPS 
++bin_SCRIPTS =  
+ 
+ TOOLS = \
+ 	apctools.zip \
diff --git a/pcb.spec b/pcb.spec
index c803c2d..36b163b 100644
--- a/pcb.spec
+++ b/pcb.spec
@@ -1,8 +1,8 @@
-%define         pcbver 20081128
+%global         pcbver    20091103
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        4%{?dist}
+Release:        1%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -17,13 +17,13 @@ Requires:       m4
 Requires:       electronics-menu
 
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
-
-Requires(post): /sbin/install-info
-Requires(preun):/sbin/install-info
-
+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 for the X window system.
+PCB is an interactive printed circuit board editor.
 PCB includes a rats nest feature, design rule checking, and can provide
 industry standard RS-274-X (Gerber), NC drill, and centroid data (X-Y data)
 output for use in the board fabrication and assembly process. PCB offers
@@ -31,22 +31,41 @@ high end features such as an autorouter and trace optimizer which can
 tremendously reduce layout time.
 
 
+%package doc
+Summary:         Documentation for PCB, An interactive printed circuit board editor
+Group:           Documentation
+Requires:        %{name} = %{version}-%{release}
+Requires(post):  info
+Requires(preun): info
+
+%description doc
+This package contains the documentation of PCB, An interactive printed circuit
+board editor.
+
+
 %prep
 %setup -q -n %{name}-%{pcbver}
 
-%{__sed} -i \
-    's|examplesdir = $(pkgdatadir)/examples|examplesdir = example/|' \
-   example/Makefile.in
+# Removes duplicates
+%patch0 -p0 -b .duplicates
 
-install -d example/thermal
-install -d example/pad
-install -d example/puller
-install -d example/LED_Interface
-%{__cp} tutorial/tut1.pcb example/LED_Interface
+%patch2 -p1 -b .upstream
 
-# rpmlint W: spurious-executable-perm
-chmod 0644 example/LED.NET
-chmod 0644 example/LED
+#
+# 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.*
+
+%{__sed} -i \
+   's|tutdir = $(pkgdatadir)/tutorial|tutdir = @docdir@/tutorial|' \
+   tutorial/Makefile.*
 
 %build
 export WISH=%{_bindir}/wish
@@ -56,7 +75,12 @@ export WISH=%{_bindir}/wish
 export CFLAGS=`echo %optflags | sed "s/-D_FORTIFY_SOURCE=2 // g" -`
 %endif
 
-%configure --disable-update-mime-database
+
+# Bug 472618 : disable-update-desktop-database
+%configure \
+    --disable-update-mime-database \
+    --disable-update-desktop-database \
+    --docdir=%{_docdir}/%{name}-%{version}
 
 %{__make} %{?_smp_mflags}
 
@@ -72,24 +96,21 @@ desktop-file-install --vendor ""               \
     --delete-original                          \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+#
+# Additional Examples
+#
+set +x
+dest=%{buildroot}%{_docdir}/%{name}-%{version}/examples
+for d in thermal pad puller ; do
+   echo -n -e "... Fixing path of $d  \t"
+   mkdir -p $dest/$d
+   mv $dest/../$d.* $dest/$d
+   install -pm 0644 doc/$d.{pcb,pdf} $dest/$d
+   sed -i "s|$d.png|examples/$d/$d.png|" $dest/../%{name}.html
+   echo "done"
+done
+set -x
 
-# restructuring for docdir and tutorial
-# renaming to .pcb extension
-%{__mv} example/LED  example/LED.pcb
-%{__mv} example/LED2 example/LED2.pcb
-
-%{__rm} -f example/Makefile*
-%{__rm} -f example/*/Makefile*
-
-%{__mv} example/LED*.* example/LED_Interface
-
-install -p -m 0644 doc/thermal.{pcb,pdf,gif,png} example/thermal/
-install -p -m 0644 doc/pad.{pcb,pdf,gif,png}     example/pad/
-install -p -m 0644 doc/puller.{pcb,pdf,gif,png}  example/puller/
-
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/tutorial/
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/example/
-%{__rm} -rf %{buildroot}%{_docdir}/%{name}
 
 ## --- pcb supports for acpcircuits
 # http://www.apcircuits.com/resources/links/pcb_unix.html
@@ -98,7 +119,7 @@ install -p -m 755 apc*.pl  %{buildroot}%{_datadir}/%{name}/tools
 
 # Removes duplicates
 %{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/apctools.zip
-%{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/{MergePCBPS,Merge_dimPCBPS}
+
 
 ## ---
 
@@ -108,59 +129,88 @@ install -p -m 755 apc*.pl  %{buildroot}%{_datadir}/%{name}/tools
 # are no more needed.
 %{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/pcb2ncap.tgz
 
-chmod 755 %{buildroot}%{_datadir}/%{name}/tools/{PCB2HPGL,tgo2pcb.tcl}
+chmod 755 %{buildroot}%{_datadir}/%{name}/tools/{PCB2HPGL,tgo2pcb.tcl,Merge*}
+
 
+cp -p AUTHORS COPYING README NEWS ChangeLog README_FILES/CHANGES \
+      README_FILES/Whats_new_in_2.0 README_FILES/Tools \
+      %{buildroot}%{_docdir}/%{name}-%{version}/
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
-# Bug 472618
-%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
 
 # locale's
 %find_lang %{name}
 
+
+%check
+%{__make} check
+
+
 %clean
 %{__rm} -rf %{buildroot}
 
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%post doc
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun doc
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
-%preun
-/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
 
 # Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
+%files doc
+%{_infodir}/%{name}*
+%doc %{_docdir}/%{name}-%{version}/refcard*
+%doc %{_docdir}/%{name}-%{version}/pcb.ps
+%doc %{_docdir}/%{name}-%{version}/*.html
+%doc %{_docdir}/%{name}-%{version}/examples/thermal
+%doc %{_docdir}/%{name}-%{version}/examples/pad
+%doc %{_docdir}/%{name}-%{version}/examples/puller
+
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING README NEWS ChangeLog
-%doc README_FILES/CHANGES README_FILES/Whats_new_in_2.0
-%doc example/ doc/refcard.pdf doc/pcb.pdf
-
+%exclude %{_docdir}/%{name}-%{version}/refcard*
+%exclude %{_docdir}/%{name}-%{version}/pcb.ps
+%exclude %{_docdir}/%{name}-%{version}/*.html
+%exclude %{_docdir}/%{name}-%{version}/examples/thermal
+%exclude %{_docdir}/%{name}-%{version}/examples/pad
+%exclude %{_docdir}/%{name}-%{version}/examples/puller
+%doc %{_docdir}/%{name}-%{version}/
 %{_datadir}/applications/%{name}.desktop
 %{_bindir}/%{name}
-%{_bindir}/MergePCBPS
-%{_bindir}/Merge_dimPCBPS
 %{_datadir}/%{name}/
-%{_infodir}/%{name}*
 %{_mandir}/man1/%{name}*
 %{_datadir}/icons/hicolor/*/mimetypes/application-x-*
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/mime/packages/pcb.xml
-%{_datadir}/mimelnk/application/x-excellon.desktop
-%{_datadir}/mimelnk/application/x-gerber.desktop
-%{_datadir}/mimelnk/application/x-pcb-*.desktop
+%{_datadir}/mimelnk/application/x-*.desktop
+
 
+%changelog
+* Sat Nov 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-1
+- New upstream release
 
-%Changelog
 * Tue Sep 8 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20081128-4
 - Fixes for PCB EL-5 build.
 
diff --git a/sources b/sources
index 2300f26..9d8c8c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e192ee993b04749f82dd3e8b529d40c0  pcb-20081128.tar.gz
+659a13bffd2269d3a0f86508a7c1531b  pcb-20091103.tar.gz