From 98d799602bb57372b3758fcf073998f58e4c0213 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 29 May 2010 00:19:23 +0000 Subject: [PATCH 1/7] Update to 2.0.36 --- .cvsignore | 2 +- sources | 2 +- wordpress-plugin-bad-behavior.spec | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1b72b7b..1a3c311 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bad-behavior.2.0.32.zip +bad-behavior.2.0.36.zip diff --git a/sources b/sources index 613670d..938862f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c050e3ba5a165c722c43f49b1071e307 bad-behavior.2.0.32.zip +137e978d8056bc77f5d1b05085af3bc1 bad-behavior.2.0.36.zip diff --git a/wordpress-plugin-bad-behavior.spec b/wordpress-plugin-bad-behavior.spec index 948a390..f5ea5ef 100644 --- a/wordpress-plugin-bad-behavior.spec +++ b/wordpress-plugin-bad-behavior.spec @@ -3,8 +3,8 @@ Name: wordpress-plugin-%{plugin_name} -Version: 2.0.32 -Release: 2%{?dist} +Version: 2.0.36 +Release: 1%{?dist} Summary: %{plugin_human_name} plugin for WordPress Group: Applications/Publishing @@ -115,6 +115,8 @@ rm -rf %{buildroot} %changelog +* Fri May 28 2010 Nick Bebout 2.0.36-1 +- Update to 2.0.36 * Tue Nov 10 2009 Nick Bebout 2.0.32-2 - Remove non-applicable comment about language files * Mon Nov 9 2009 Nick Bebout 2.0.32-1 From b9588d72d6be7754643a67e0ce597928b441f0e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:24:15 +0000 Subject: [PATCH 2/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7b72639..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wordpress-plugin-bad-behavior -# $Id$ -NAME := wordpress-plugin-bad-behavior -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index e32503a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -wordpress-plugin-bad-behavior-2_0_32-2_fc12:HEAD:wordpress-plugin-bad-behavior-2.0.32-2.fc12.src.rpm:1259878071 From 1250697ca576728b458fae3403f29f66fa87f7e6 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 18 Aug 2010 17:09:15 -0400 Subject: [PATCH 3/7] Update to 2.0.38 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1a3c311..ea22d86 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bad-behavior.2.0.36.zip +/bad-behavior.2.0.38.zip diff --git a/sources b/sources index 938862f..2e82062 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -137e978d8056bc77f5d1b05085af3bc1 bad-behavior.2.0.36.zip +50f2aab72806a33f1b9810f0e7ef8c61 bad-behavior.2.0.38.zip From e34cee2e15b1215964b97171c3095de80849bc2d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 18 Aug 2010 17:09:29 -0400 Subject: [PATCH 4/7] Update to 2.0.38 --- wordpress-plugin-bad-behavior.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wordpress-plugin-bad-behavior.spec b/wordpress-plugin-bad-behavior.spec index f5ea5ef..fe088f3 100644 --- a/wordpress-plugin-bad-behavior.spec +++ b/wordpress-plugin-bad-behavior.spec @@ -3,7 +3,7 @@ Name: wordpress-plugin-%{plugin_name} -Version: 2.0.36 +Version: 2.0.38 Release: 1%{?dist} Summary: %{plugin_human_name} plugin for WordPress @@ -115,6 +115,8 @@ rm -rf %{buildroot} %changelog +* Wed Aug 18 2010 Nick Bebout 2.0.38-1 +- Update to 2.0.38 * Fri May 28 2010 Nick Bebout 2.0.36-1 - Update to 2.0.36 * Tue Nov 10 2009 Nick Bebout 2.0.32-2 From c75c4f8fbfec8c9524eb564b3b4f34446f2a1c99 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:02:31 -0600 Subject: [PATCH 5/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- wordpress-plugin-bad-behavior.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress-plugin-bad-behavior.spec b/wordpress-plugin-bad-behavior.spec index fe088f3..bae7e45 100644 --- a/wordpress-plugin-bad-behavior.spec +++ b/wordpress-plugin-bad-behavior.spec @@ -4,7 +4,7 @@ Name: wordpress-plugin-%{plugin_name} Version: 2.0.38 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{plugin_human_name} plugin for WordPress Group: Applications/Publishing @@ -115,6 +115,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.0.38-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Aug 18 2010 Nick Bebout 2.0.38-1 - Update to 2.0.38 * Fri May 28 2010 Nick Bebout 2.0.36-1 From 5406adb09580c3f9febaaff24b398a4d50cb4d0d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 26 Feb 2011 19:24:59 -0600 Subject: [PATCH 6/7] Remove -mu subpackage, bump to 2.0.42 --- .gitignore | 1 + sources | 2 +- wordpress-plugin-bad-behavior.spec | 59 +++++------------------------- 3 files changed, 12 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index ea22d86..7ad0a80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bad-behavior.2.0.36.zip /bad-behavior.2.0.38.zip +/bad-behavior.2.0.42.zip diff --git a/sources b/sources index 2e82062..dc1ef17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50f2aab72806a33f1b9810f0e7ef8c61 bad-behavior.2.0.38.zip +75627f519d8330aef56649d78ad27c5c bad-behavior.2.0.42.zip diff --git a/wordpress-plugin-bad-behavior.spec b/wordpress-plugin-bad-behavior.spec index bae7e45..5a448f8 100644 --- a/wordpress-plugin-bad-behavior.spec +++ b/wordpress-plugin-bad-behavior.spec @@ -3,8 +3,8 @@ Name: wordpress-plugin-%{plugin_name} -Version: 2.0.38 -Release: 2%{?dist} +Version: 2.0.42 +Release: 1%{?dist} Summary: %{plugin_human_name} plugin for WordPress Group: Applications/Publishing @@ -37,54 +37,16 @@ Bad Behavior is designed to work alongside existing spam prevention services to increase their effectiveness and efficiency. Whenever possible, you should run it in combination with a more traditional spam prevention service. -This package is built for use with WordPress (wordpress), not WordPress MU. Use -wordpress-mu-plugin-%{plugin_name} for WordPress MU. +This package is built for use with WordPress (wordpress), not WordPress MU. -%package -n wordpress-mu-plugin-%{plugin_name} -Summary: %{plugin_human_name} plugin for WordPress MU -Group: Applications/Publishing -# According to http://plugins.trac.wordpress.org/ all plugins are licensed -# under the GPL unless otherwise stated in the plugin source. -License: GPLv2+ -Requires: wordpress-mu -BuildArch: noarch - -%description -n wordpress-mu-plugin-%{plugin_name} -Bad Behavior is a PHP-based solution for blocking link spam and the robots -which deliver it. - -Bad Behavior complements other link spam solutions by acting as a gatekeeper, -preventing spammers from ever delivering their junk, and in many cases, from -ever reading your site in the first place. This keeps your site's load down, -makes your site logs cleaner, and can help prevent denial of service conditions -caused by spammers. - -Bad Behavior also transcends other link spam solutions by working in a -completely different, unique way. Instead of merely looking at the content of -potential spam, Bad Behavior analyzes the delivery method as well as the -software the spammer is using. In this way, Bad Behavior can stop spam attacks -even when nobody has ever seen the particular spam before. - -Bad Behavior is designed to work alongside existing spam prevention services to -increase their effectiveness and efficiency. Whenever possible, you should run -it in combination with a more traditional spam prevention service. - -This package is built for use with WordPress MU (wordpress-mu), not regular -WordPress. Use wordpress-plugin-%{plugin_name} for regular Wordpress. - %prep %setup -q -c echo 'To enable "%{plugin_human_name}", go to the administrative section of your blog, "Plugins", and enable the plugin there.' > README.fedora -echo 'To allow users to enable "%{plugin_human_name}" for their blogs, -be sure to enable this plugin in the administrative control panel -for your website.' > README.fedora.mu - %build - %install rm -rf %{buildroot} # Pull doc files up so they aren't duplicated @@ -93,8 +55,6 @@ mv %{plugin_name}/{COPYING,README.txt} . rm -f %{plugin_name}/bad-behavior-{lifetype,mediawiki}.php mkdir -p %{buildroot}%{_datadir}/wordpress/wp-content/plugins/ cp -a %{plugin_name} %{buildroot}%{_datadir}/wordpress/wp-content/plugins/ -mkdir -p %{buildroot}%{_datadir}/wordpress-mu/wp-content/plugins/ -cp -a %{plugin_name} %{buildroot}%{_datadir}/wordpress-mu/wp-content/plugins/ # Note, no %find_lang since there are no language files @@ -108,23 +68,24 @@ rm -rf %{buildroot} %{_datadir}/wordpress/wp-content/plugins/%{plugin_name} -%files -n wordpress-mu-plugin-%{plugin_name} -%defattr(-,root,root,-) -%doc COPYING README.txt README.fedora.mu -%{_datadir}/wordpress-mu/wp-content/plugins/%{plugin_name} - - %changelog +* Sat Feb 26 2011 Nick Bebout 2.0.42-1 +- Remove -mu subpackage, bump to 2.0.42 + * Mon Feb 07 2011 Fedora Release Engineering - 2.0.38-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Wed Aug 18 2010 Nick Bebout 2.0.38-1 - Update to 2.0.38 + * Fri May 28 2010 Nick Bebout 2.0.36-1 - Update to 2.0.36 + * Tue Nov 10 2009 Nick Bebout 2.0.32-2 - Remove non-applicable comment about language files + * Mon Nov 9 2009 Nick Bebout 2.0.32-1 - Fix packaging issues + * Wed Jul 15 2009 Michael Hampton 2.0.28 - Initial package build From 75a332e212932b1d007a8b0574c034a333d7e577 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 26 Feb 2011 19:34:47 -0600 Subject: [PATCH 7/7] Rename COPYING to gpl-2.0.txt --- wordpress-plugin-bad-behavior.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wordpress-plugin-bad-behavior.spec b/wordpress-plugin-bad-behavior.spec index 5a448f8..882f151 100644 --- a/wordpress-plugin-bad-behavior.spec +++ b/wordpress-plugin-bad-behavior.spec @@ -50,7 +50,7 @@ of your blog, "Plugins", and enable the plugin there.' > README.fedora %install rm -rf %{buildroot} # Pull doc files up so they aren't duplicated -mv %{plugin_name}/{COPYING,README.txt} . +mv %{plugin_name}/{gpl-2.0.txt,README.txt} . # Trim some non-WordPress files we don't need rm -f %{plugin_name}/bad-behavior-{lifetype,mediawiki}.php mkdir -p %{buildroot}%{_datadir}/wordpress/wp-content/plugins/ @@ -64,7 +64,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING README.txt README.fedora +%doc gpl-2.0.txt README.txt README.fedora %{_datadir}/wordpress/wp-content/plugins/%{plugin_name}