- Workaround to make it build: don't run aclocal+autoconf+autoheader+

  automake, disable acamfixes.patch, use %configure2_13, patch Makefile.in
  instead of Makefile.am. Automake is broken.

Changed files:
    vice-DESTDIR.patch -> 1.2
    vice.spec -> 1.18

diff --git a/vice-DESTDIR.patch b/vice-DESTDIR.patch
index 2f137e17247d924e39b14bcd912dc1b80c62fb71..ebd374545c3aa104c8d9e064e47642f91198deb3 100644 (file)
--- a/vice-DESTDIR.patch
+++ b/vice-DESTDIR.patch
@@ -1,5 +1,5 @@
 --- vice-1.8/data/fonts/Makefile.am.orig       Mon Mar 20 01:27:23 2000
-+++ vice-1.8/data/fonts/Makefile.am    Sat Mar 30 10:15:21 2002
++++ vice-1.8/data/fonts/Makefile.in    Sat Mar 30 10:15:21 2002
 @@ -7,7 +7,7 @@
  
  install: 

diff --git a/vice.spec b/vice.spec
index 15b5851f81914bec0923919e17bd055bba4177b5..60519dd64885a42ae3ee906096c3474f775ec79c 100644 (file)
--- a/vice.spec
+++ b/vice.spec
@@ -49,19 +49,19 @@ VIC20, wszystkie modele PET (poza SuperPET 9000) oraz CBM-II (C610).
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 
 %build
 rm -f missing
 gettextize --copy --force
-aclocal
-autoconf
-autoheader
-automake -a -c -f
-cd src/resid
-autoconf
-cd ../..
-%configure \
+#aclocal
+#autoconf
+#autoheader
+#automake -a -c -f
+#cd src/resid
+#autoconf
+#cd ../..
+%configure2_13 \
        --enable-autobpp \
        --with-sdl \
        --with-x \