import v1.0.2 from Fedora

2 files changed, 171 insertions, 61 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/libwebp.spec b/libwebp.spec
index 12e2527..1e6545f 100644
--- a/libwebp.spec
+++ b/libwebp.spec
@@ -1,21 +1,24 @@
-%global with_java 1
 %global _hardened_build 1
 
-Name:		libwebp
-Version:	0.3.1
-Release:	2%{?dist}
-Group:		Development/Libraries
-URL:		http://webmproject.org/
-Summary:	Library and tools for the WebP graphics format
+Name:          libwebp
+Version:       1.0.2
+Release:       2%{?dist}
+URL:           http://webmproject.org/
+Summary:       Library and tools for the WebP graphics format
 # Additional IPR is licensed as well. See PATENTS file for details
-License:	BSD
-Source0:	http://webp.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:	libwebp_jni_example.java	
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libjpeg-devel libpng-devel libtool swig 
-BuildRequires:  giflib-devel
-BuildRequires:  libtiff-devel
+License:       BSD
+Source0:       http://downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz
+Source1:       libwebp_jni_example.java
+
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: giflib-devel
+BuildRequires: libtiff-devel
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: swig
+BuildRequires: autoconf automake libtool
+BuildRequires: freeglut-devel
 
 %description
 WebP is an image format that does lossy compression of digital
@@ -24,10 +27,9 @@ container based on RIFF. Webmasters, web developers and browser
 developers can use WebP to compress, archive and distribute digital
 images more efficiently.
 
+
 %package tools
-Group:		Development/Tools
-Summary:	The WebP command line tools
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+Summary:       The WebP command line tools
 
 %description tools
 WebP is an image format that does lossy compression of digital
@@ -36,10 +38,10 @@ container based on RIFF. Webmasters, web developers and browser
 developers can use WebP to compress, archive and distribute digital
 images more efficiently.
 
+
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for libwebp, a library for the WebP format
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+Summary:       Development files for libwebp, a library for the WebP format
+Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 WebP is an image format that does lossy compression of digital
@@ -48,94 +50,195 @@ container based on RIFF. Webmasters, web developers and browser
 developers can use WebP to compress, archive and distribute digital
 images more efficiently.
 
-%if %{with_java}
+
 %package java
-Group:		Development/Libraries
-Summary:	Java bindings for libwebp, a library for the WebP format
-Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	java
-Requires:	jpackage-utils
-BuildRequires:	java-devel
-BuildRequires:	jpackage-utils
+Summary:       Java bindings for libwebp, a library for the WebP format
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+Requires:      java-headless
+Requires:      jpackage-utils
 
 %description java
 Java bindings for libwebp.
-%endif
+
 
 %prep
-%setup -q
+%autosetup -p1
+
 
 %build
-./autogen.sh
-%configure --disable-static --enable-libwebpmux --enable-libwebpdemux
-make %{?_smp_mflags}
+autoreconf -vif
+%ifarch aarch64
+export CFLAGS="%{optflags} -frename-registers"
+%endif
+# Neon disabled due to resulting CFLAGS conflict resulting in
+# inlining failed in call to always_inline '[...]': target specific option mismatch
+%configure --disable-static --enable-libwebpmux \
+           --enable-libwebpdemux --enable-libwebpdecoder \
+           --disable-neon
+%make_build V=1
 
-%if %{with_java}
 # swig generated Java bindings
 cp %{SOURCE1} .
 cd swig
 rm -rf libwebp.jar libwebp_java_wrap.c
 mkdir -p java/com/google/webp
 swig -ignoremissing -I../src -java \
-	-package com.google.webp  \
-	-outdir java/com/google/webp \
-	-o libwebp_java_wrap.c libwebp.i
+    -package com.google.webp  \
+    -outdir java/com/google/webp \
+    -o libwebp_java_wrap.c libwebp.swig
 
-gcc %{optflags} -shared -fPIC \
-	-I/usr/lib/jvm/java/include \
-	-I/usr/lib/jvm/java/include/linux \
-	-I../src \
-	-L../src/.libs -lwebp libwebp_java_wrap.c \
-	-o libwebp_jni.so
+gcc %{__global_ldflags} %{optflags} -shared \
+    -I/usr/lib/jvm/java/include \
+    -I/usr/lib/jvm/java/include/linux \
+    -I../src \
+    -L../src/.libs -lwebp libwebp_java_wrap.c \
+    -o libwebp_jni.so
 
 cd java
 javac com/google/webp/libwebp.java
 jar cvf ../libwebp.jar com/google/webp/*.class
-%endif
+
 
 %install
 %make_install
 find "%{buildroot}/%{_libdir}" -type f -name "*.la" -delete
 
-%if %{with_java}
 # swig generated Java bindings
 mkdir -p %{buildroot}/%{_libdir}/%{name}-java
 cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/
-%endif
 
-%post -n %{name} -p /sbin/ldconfig
 
-%postun -n %{name} -p /sbin/ldconfig
+%ldconfig_scriptlets
+
 
 %files tools
-%defattr(-,root,root,-)
 %{_bindir}/cwebp
 %{_bindir}/dwebp
 %{_bindir}/gif2webp
+%{_bindir}/img2webp
+%{_bindir}/webpinfo
 %{_bindir}/webpmux
+%{_bindir}/vwebp
 %{_mandir}/man*/*
 
-%files
-%defattr(-,root,root,-)
-%doc README PATENTS COPYING NEWS AUTHORS
-%{_libdir}/%{name}*.so.*
+%files -n %{name}
+%doc README PATENTS NEWS AUTHORS
+%license COPYING
+%{_libdir}/%{name}.so.7*
+%{_libdir}/%{name}decoder.so.3*
+%{_libdir}/%{name}demux.so.2*
+%{_libdir}/%{name}mux.so.3*
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/%{name}*.so
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 
-%if %{with_java}
 %files java
-%defattr(-,root,root,-)
 %doc libwebp_jni_example.java
 %{_libdir}/%{name}-java/
-%endif
+
 
 %changelog
-* Sat Nov  2 2013 Remi Collet <rpms@famillecollet.com> - 0.3.1-2
-- backport for EL in remi repo
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 22 2019 Sandro Mani <manisandro@gmail.com> - 1.0.2-1
+- Update to 1.0.2
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Apr 26 2018 Sandro Mani <manisandro@gmail.com> - 1.0.0-1
+- Update to 1.0.0
+
+* Tue Feb 27 2018 Sandro Mani <manisandro@gmail.com> - 0.6.1-8
+- Fix LDFLAGS not passed when building libwebp_jni.so (#1548718)
+
+* Mon Feb 26 2018 Sandro Mani <manisandro@gmail.com> - 0.6.1-7
+- More big-endian fixes
+
+* Fri Feb 16 2018 Sandro Mani <manisandro@gmail.com> - 0.6.1-6
+- Backport another big-endian fix
+
+* Fri Feb 16 2018 Sandro Mani <manisandro@gmail.com> - 0.6.1-5
+- Backport upstream big-endian fix
+
+* Tue Feb 13 2018 Sandro Mani <manisandro@gmail.com> - 0.6.1-4
+- Rebuild (giflib)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.1-2
+- Switch to %%ldconfig_scriptlets
+
+* Thu Nov 30 2017 Sandro Mani <manisandro@gmail.com> - 0.6.1-1
+- Update to 0.6.1
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 0.6.0-1
+- Update to 0.6.0
+
+* Thu Dec 22 2016 Sandro Mani <manisandro@gmail.com> - 0.5.2-1
+- Update to 0.5.2
+
+* Sat Oct 29 2016 Sandro Mani <manisandro@gmail.com> - 0.5.1-2
+- Backport e2affacc35f1df6cc3b1a9fa0ceff5ce2d0cce83 (CVE-2016-9085, rhbz#1389338)
+
+* Fri Aug 12 2016 Sandro Mani <manisandro@gmail.com> - 0.5.1-1
+- upstream release 0.5.1
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Dec 28 2015 Sandro Mani <manisandro@gmail.com> - 0.5.0-1
+- upstream release 0.5.0
+
+* Fri Oct 30 2015 Sandro Mani <manisandro@gmail.com> - 0.4.4-1
+- upstream release 0.4.4
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Mar 27 2015 Sandro Mani <manisandro@gmail.com> - 0.4.3-2
+- Add BuildRequires: freeglut-devel to build vwebp
+
+* Thu Mar 12 2015 Sandro Mani <manisandro@gmail.com> - 0.4.3-1
+- upstream release 0.4.3
+
+* Fri Oct 17 2014 Sandro Mani <manisandro@gmail.com> - 0.4.2-1
+- upstream release 0.4.2
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Aug 13 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.4.1-2
+- Use frename-registers cflag to fix FTBFS on aarch64
+
+* Tue Aug 05 2014 Sandro Mani <manisandro@gmail.com> - 0.4.1-1
+- upstream release 0.4.1
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Apr 08 2014 Jaromir Capik <jcapik@redhat.com> - 0.4.0-3
+- Fixing endian checks (#962091)
+- Fixing FTPBS caused by rpath presence
+
+* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 0.4.0-2
+- Use Requires: java-headless rebuild (#1067528)
+
+* Thu Jan 02 2014 Sandro Mani <manisandro@gmail.com> - 0.4.0-1
+- upstream release 0.4.0
 
 * Wed Oct 02 2013 Sandro Mani <manisandro@gmail.com> - 0.3.1-2
 - enable webpdemux
@@ -173,4 +276,3 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/
 
 * Wed May 25 2011 Rahul Sundaram <sundaram@fedoraproject.org> - 0.1.2-1
 - Initial spec. Based on openSUSE one
-