diff --git a/thttpd-2.25b-x86_64_machine_not_recognized.patch b/thttpd-2.25b-x86_64_machine_not_recognized.patch deleted file mode 100644 index 532fb3b..0000000 --- a/thttpd-2.25b-x86_64_machine_not_recognized.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: thttpd-2.25b/config.sub -=================================================================== ---- thttpd-2.25b.orig/config.sub 1998-05-09 03:12:58.000000000 +0200 -+++ thttpd-2.25b/config.sub 2012-01-31 13:56:25.647548490 +0100 -@@ -15,7 +15,7 @@ - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU General Public License for more details. - # --# You should have received a copy of the GNU General Public License -+38# You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. -@@ -164,6 +164,9 @@ - i[3456]86) - basic_machine=$basic_machine-pc - ;; -+ x86_64-*) -+ basic_machine=$basic_machine-pc -+ ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 diff --git a/thttpd.changes b/thttpd.changes index 0ee657e..ee9ab4d 100644 --- a/thttpd.changes +++ b/thttpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 22 09:33:49 UTC 2012 - dvaleev@suse.com + +- drop thttpd-2.25b-x86_64_machine_not_recognized.patch but copy + config.guess from automake to fix ppc64 as well + ------------------------------------------------------------------- Tue Jan 31 13:07:43 UTC 2012 - vcizek@suse.com diff --git a/thttpd.spec b/thttpd.spec index 0dc42cc..7b7485e 100644 --- a/thttpd.spec +++ b/thttpd.spec @@ -36,13 +36,12 @@ Patch9: %{name}-%{version}-chown.diff Patch10: %{name}-%{version}-zerolen.patch Patch11: %{name}-%{version}-strcpy.patch Patch12: thttpd-2.25b-getline.patch -Patch13: thttpd-2.25b-x86_64_machine_not_recognized.patch Url: http://www.acme.com/software/thttpd/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Small and very simple webserver License: BSD-3-Clause Group: Productivity/Networking/Web/Servers -BuildRequires: libtool +BuildRequires: libtool automake %description Thttpd is a very compact no-frills httpd serving daemon that can handle @@ -75,9 +74,9 @@ Authors: %patch10 %patch11 %patch12 -%patch13 -p1 %build +cp /usr/share/automake-1.11/config.* . # update server root path sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf sed -i "s@__PREFIX__@%{_prefix}@g;\