- new TODO about make breakage

[packages/aegisub.git] / aegisub.spec

diff --git a/aegisub.spec b/aegisub.spec
index 5a1bcc84d8ee02cbc72ca1e7d3dec16075845e73..c7af3ce938bf5b71a42b5a4784c9c3aa753d4a18 100644 (file)
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -1,4 +1,5 @@
 # TODO
+# - make 4.3 breaks build
 # - unvendor vendor/luabins
 # - unvendor vendor/luajit
 # - unvendor vendor/universalchardet
@@ -11,13 +12,17 @@ Summary:    Subtitle editor
 Summary(pl.UTF-8):     Edytor napisów
 Name:          aegisub
 Version:       3.2.2
-Release:       6
+Release:       14
 License:       BSD
 Group:         X11/Applications
 Source0:       http://ftp.aegisub.org/pub/releases/%{name}-%{version}.tar.xz
 # Source0-md5: d80e852c34811add358c06d77f5cd40d
 Patch0:                pthread.patch
-URL:           http://www.aegisub.net/
+Patch1:                %{name}-icu.patch
+Patch2:                %{name}-icu64.patch
+Patch3:                %{name}-boost-1.70.patch
+Patch4:                cflags.patch
+URL:           http://www.aegisub.org/
 # AC_AGI_COMPILE tries to run test program which tries to open device and most likely fails
 #BuildRequires:        OpenAL-devel >= 0.0.8
 BuildRequires: OpenGL-devel
@@ -55,6 +60,8 @@ Requires:     hunspell >= 1.2.0
 Requires:      libass >= 0.9.7
 Requires:      libicu >= 4.8.1.1
 Requires:      pulseaudio-libs >= 0.5
+# due to luajit usage
+ExclusiveArch: %{ix86} %{x8664} arm mips ppc
 # missing atomic_ops
 ExcludeArch:   i386 i486
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,12 +89,24 @@ obsługa tych zaawansowanych funkcji.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %{__mv} vendor{,.keep}
 mkdir vendor
 %{__mv} vendor.keep/{luabins,luajit,universalchardet} vendor
 
 %build
+<<<<<<< Updated upstream
+%{__aclocal} -I m4macros
+=======
+%{__libtoolize}
+%{__aclocal}
+>>>>>>> Stashed changes
+%{__autoconf}
+%{__autoheader}
 %configure \
        --disable-update-checker \
        %{__with_without ffms2} \