From 414a08fa20a07dc5c8877d9864335b7cbd5a0ee1 Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Sep 13 2009 15:19:59 +0000
Subject: no layer orientation crash fix


---

diff --git a/gerbv-empty_orientation.patch b/gerbv-empty_orientation.patch
new file mode 100644
index 0000000..efcebb5
--- /dev/null
+++ b/gerbv-empty_orientation.patch
@@ -0,0 +1,26 @@
+--- src/callbacks.c	2009-07-10 23:34:26.000000000 +0200
++++ callbacks.c	2009-09-13 15:59:38.561102851 +0200
+@@ -1997,6 +1997,14 @@
+ callbacks_change_layer_orientation_clicked  (GtkButton *button, gpointer userData){
+ 	gint index = callbacks_get_selected_row_index();
+ 
++	if (index < 0) {
++		interface_show_alert_dialog("No layers are currently loaded",
++									"A layer must be loaded before the orientation can be modified.",
++									FALSE,
++									NULL);
++		return;
++	}
++	
+ 	interface_show_modify_orientation_dialog(&mainProject->file[index]->transform,screen.unit);
+ 	render_refresh_rendered_image_on_screen ();
+ 	callbacks_update_layer_tree ();	
+@@ -2433,7 +2441,7 @@
+ callbacks_delete_objects_clicked (GtkButton *button, gpointer   user_data){
+ 	if (screen.selectionInfo.type == GERBV_SELECTION_EMPTY) {
+ 		interface_show_alert_dialog("No object is currently selected",
+-		                        NULL,
++		                        "Objects must be selected using the pointer tool before they can be deleted.",
+ 		                        FALSE,
+ 		                        NULL);
+ 		return;
diff --git a/gerbv.spec b/gerbv.spec
index daff3a0..5551277 100644
--- a/gerbv.spec
+++ b/gerbv.spec
@@ -1,13 +1,18 @@
+# Fixing the end-of-line encodings is omitted because of
+# https://fedorahosted.org/fedora-electronic-lab/ticket/47
+
 Name:             gerbv
 Version:          2.3.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
 License:          GPLv2
-URL:              http://gerbv.sourceforge.net/
+URL:              http://gerbv.gpleda.org/index.html
 
 Source:           http://downloads.sourceforge.net/gerbv/%{name}-%{version}.tar.gz
+# Fix bug 2841371 (segfault on edit->orientation with no layer loaded
+Patch0:           gerbv-empty_orientation.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtk2-devel, libpng-devel, desktop-file-utils, automake, ImageMagick-devel
@@ -44,6 +49,8 @@ you will need to install %{name}-devel.
 %prep
 %setup -q
 
+%patch0 -p0 -b .orientation
+
 %build
 
 # default measurement units set to millimeters
@@ -65,7 +72,7 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 %{__make} INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 
-desktop-file-install --vendor fedora           \
+desktop-file-install --vendor ""               \
     --remove-category Education                \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original                          \
@@ -89,17 +96,6 @@ for dir in * ; do
 done
 popd
 
-#Fixing the end-of-line encodings
-set +x
-for f in `find example/ -name \*.* | sort` doc/eagle/eagle2exc.txt ; do
-   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
-   sed -i.bak -e 's|\r||g' $f
-   touch -r $f.bak $f
-   %{__rm} -f $f.bak
-   echo "done"
-done
-set -x
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -119,7 +115,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO CONTRIBUTORS HACKING
 %doc example/
 %doc doc/example-code
 %doc doc/eagle
@@ -131,7 +127,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_mandir}/man1/gerbv.*
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_libdir}/lib%{name}.so.*
 
 
@@ -144,6 +140,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Sun Sep 13 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-2
+- Fixed gerbv-2.3.0-1 png failed to open - FEL ticket #47 
+- Fixed bug 2841371 (segfault on edit->orientation with no layer loaded)
+
 * Sat Jul 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.3.0-1
 - new upstream release
 
diff --git a/import.log b/import.log
index 27a02bf..db54f71 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 gerbv-2_1_0-2_fc9:HEAD:gerbv-2.1.0-2.fc9.src.rpm:1226608797
 gerbv-2_2_0-1_fc10:HEAD:gerbv-2.2.0-1.fc10.src.rpm:1233179942
 gerbv-2_3_0-1_fc11:F-11:gerbv-2.3.0-1.fc11.src.rpm:1247389952
+gerbv-2_3_0-2_fc11:F-11:gerbv-2.3.0-2.fc11.src.rpm:1252854968