[gerbv/el5] 2.6.0

[Chitlesh GOORAH]

commit 8ac6b423ce86d3e24bd1508594b415610a9edece
Author: Chitlesh GOORAH <chitlesh at fedoraproject.org>
Date:   Thu Jan 5 16:18:42 2012 +0100

    2.6.0

 .gitignore |    1 +
 gerbv.spec |   34 +++++++++++++++++++++++++++-------
 sources    |    2 +-
 3 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96a6497..9c9d69d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gerbv-2.4.0.tar.gz
 /gerbv-2.5.0.tar.gz
+/gerbv-2.6.0.tar.gz
diff --git a/gerbv.spec b/gerbv.spec
index 859121f..40cfc89 100644
--- a/gerbv.spec
+++ b/gerbv.spec
@@ -1,14 +1,20 @@
+# Features in Fedora/Free Electronic Lab
+#   Supported targets: EL-5, EL-6, F-15, F-16 and rawhide
+
 # Fixing the end-of-line encodings is omitted because of
 # https://fedorahosted.org/fedora-electronic-lab/ticket/47
 
+# Known bug reports not treated by this SPEC:
+# SF#3469821 Rendering issue with fast and high quality- NOT FIXED YET
+
 Name:             gerbv
-Version:          2.5.0
+Version:          2.6.0
 Release:          1%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
 License:          GPLv2
-URL:              http://gerbv.gpleda.org/index.html
+URL:              http://gerbv.gpleda.org/
 
 Source:           http://downloads.sourceforge.net/gerbv/%{name}-%{version}.tar.gz
 # Fixed bug 2841371 (segfault on edit->orientation with no layer loaded
@@ -49,17 +55,21 @@ you will need to install %{name}-devel.
 %setup -q
 
 %build
-export CFLAGS="$CXXFLAGS -ldl -lpthread"
-
 # default measurement units set to millimeters
 %configure             \
    --enable-exportpng  \
    --enable-unit-mm    \
    --disable-update-desktop-database \
    --disable-static    \
-   --enable-gtk2
+   --enable-gtk2 \
+   CFLAGS="${RPM_OPT_FLAGS}" \
+   LIBS="-ldl -lpthread"
+
+# Don't use rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-# clean unused-direct-shlib-dependencies
+# Clean unused-direct-shlib-dependencies
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 %{__make} %{?_smp_mflags}
@@ -138,7 +148,17 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %Changelog
-* Sun Jun 03 2011 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.5.0-1
+* Tue Jan 03 2012 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.6.0-1
+- new upstream release
+
+* Tue Jul 05 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.5.0-2
+- Hack libtool to not add rpath.
+- Propagate RPM_OPT_FLAGS to CFLAGS.
+- Pass -ldl through LIBS.
+- Fix date of previous changelog entry.
+- Remove "unused-direct-shlib-dependencies" libtool hacking.
+
+* Sun Jul 03 2011 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.5.0-1
 - new upstream release
 
 * Thu Jul 01 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.4.0-1
diff --git a/sources b/sources
index 8bb829a..1533407 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-633a55473f62b96fff302ed1ed52c88e  gerbv-2.5.0.tar.gz
+44a37dd202bc60fab54cbc298a477572  gerbv-2.6.0.tar.gz