xfce4-netload-plugin: Updated to 1.2.0

SOURCE matches upstream posted SHA1
SOURCE_URL updated
bug2782-asneeded.patch: Removed, now applied

6 files changed, 9 insertions, 22 deletions

diff --git a/xfce-plugins/xfce4-netload-plugin/DETAILS b/xfce-plugins/xfce4-netload-plugin/DETAILS
index c5f805c20d..c57a2a6b05 100755
--- a/xfce-plugins/xfce4-netload-plugin/DETAILS
+++ b/xfce-plugins/xfce4-netload-plugin/DETAILS
@@ -1,10 +1,10 @@
            SPELL=xfce4-netload-plugin
-         VERSION=0.4.0
+         VERSION=1.2.0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
+   SOURCE_URL[0]=http://archive.xfce.org/src/panel-plugins/$SPELL/${VERSION%.*}/$SOURCE
         WEB_SITE=http://xfce-goodies.berlios.de
-      SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
       LICENSE[0]=GPL
          ENTERED=20030827
         KEYWORDS="xfce"
diff --git a/xfce-plugins/xfce4-netload-plugin/HISTORY b/xfce-plugins/xfce4-netload-plugin/HISTORY
index e736dca1b9..6af3454e49 100644
--- a/xfce-plugins/xfce4-netload-plugin/HISTORY
+++ b/xfce-plugins/xfce4-netload-plugin/HISTORY
@@ -1,3 +1,9 @@
+2013-06-18 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 1.2.0
+	  SOURCE matches upstream posted SHA1
+	  SOURCE_URL updated
+	* PRE_BUILD, bug2782-asneeded.patch: Removed, now applied
+
 2009-05-08 Eric Sandall <sandalle@sourcemage.org>
 	* PRE_BUILD: Apply bug2782-asneeded.patch
 	* bug2782-asneeded.patch: Fix compilation with --as-needed in LDFLAGS
diff --git a/xfce-plugins/xfce4-netload-plugin/PRE_BUILD b/xfce-plugins/xfce4-netload-plugin/PRE_BUILD
deleted file mode 100755
index 3116365f2a..0000000000
--- a/xfce-plugins/xfce4-netload-plugin/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build                                  &&
-patch  $SOURCE_DIRECTORY/panel-plugin/Makefile.in  \
-       $SCRIPT_DIRECTORY/bug2782-asneeded.patch
diff --git a/xfce-plugins/xfce4-netload-plugin/bug2782-asneeded.patch b/xfce-plugins/xfce4-netload-plugin/bug2782-asneeded.patch
deleted file mode 100644
index f8dcf4fb70..0000000000
--- a/xfce-plugins/xfce4-netload-plugin/bug2782-asneeded.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Based on http://bugzilla.xfce.org/show_bug.cgi?id=2782
-# but applied to Makefile.in instead of Makefile.am
-#
-diff -Naur xfce4-netload-plugin-0.4.0.orig/panel-plugin/Makefile.in xfce4-netload-plugin-0.4.0/panel-plugin/Makefile.in
---- xfce4-netload-plugin-0.4.0.orig/panel-plugin/Makefile.in	2009-05-08 18:36:12.377732648 -0700
-+++ xfce4-netload-plugin-0.4.0/panel-plugin/Makefile.in	2009-05-08 18:37:22.776952639 -0700
-@@ -216,7 +216,7 @@
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
- 	@LIBXFCE4PANEL_CFLAGS@
- 
--xfce4_netload_plugin_LDFLAGS = \
-+xfce4_netload_plugin_LDADD = \
- 	@SOLLIBS@                                   			\
- 	@LIBXFCE4PANEL_LIBS@
- 
diff --git a/xfce-plugins/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0.tar.bz2.sig b/xfce-plugins/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0.tar.bz2.sig
deleted file mode 100644
index 1e9326400e..0000000000
--- a/xfce-plugins/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0.tar.bz2.sig
+++ /dev/null
diff --git a/xfce-plugins/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0.tar.bz2.sig b/xfce-plugins/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0.tar.bz2.sig
new file mode 100644
index 0000000000..dd350fbf5b
--- /dev/null
+++ b/xfce-plugins/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0.tar.bz2.sig