- new TODO about make breakage

[packages/aegisub.git] / aegisub.spec

diff --git a/aegisub.spec b/aegisub.spec
index a802cd62db2a855a0867b5d3a8c065d5e360a88a..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,7 +12,7 @@ Summary:      Subtitle editor
 Summary(pl.UTF-8):     Edytor napisów
 Name:          aegisub
 Version:       3.2.2
-Release:       12
+Release:       14
 License:       BSD
 Group:         X11/Applications
 Source0:       http://ftp.aegisub.org/pub/releases/%{name}-%{version}.tar.xz
@@ -20,7 +21,8 @@ Patch0:               pthread.patch
 Patch1:                %{name}-icu.patch
 Patch2:                %{name}-icu64.patch
 Patch3:                %{name}-boost-1.70.patch
-URL:           http://www.aegisub.net/
+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
@@ -90,12 +92,21 @@ obsługa tych zaawansowanych funkcji.
 %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} \