Merge and update

i9ce
MSVSphere Packaging Team 1 year ago
commit 8f1b67bb7b

@ -0,0 +1,51 @@
diff -up djvulibre-3.5.25/configure~ djvulibre-3.5.25/configure
--- djvulibre-3.5.25/configure~ 2012-05-08 05:56:53.000000000 +0300
+++ djvulibre-3.5.25/configure 2012-10-10 00:01:36.000000000 +0300
@@ -14733,6 +14733,7 @@ fi
OPTS=
+if false; then
saved_CXXFLAGS="$CXXFLAGS"
saved_CFLAGS="$CFLAGS"
CXXFLAGS=
@@ -14750,6 +14751,7 @@ fi
*) CFLAGS="$CFLAGS $opt" ;;
esac
done
+fi
if test x$ac_debug = xno ; then
OPTS=-DNDEBUG
@@ -14770,6 +14772,7 @@ $as_echo "no" >&6; }
fi
+if false; then
opt="-O3"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
$as_echo_n "checking if $CXX accepts $opt... " >&6; }
@@ -14801,6 +14804,7 @@ $as_echo "no" >&6; }
fi
fi
+fi
opt="-Wno-non-virtual-dtor"
@@ -14819,6 +14823,7 @@ $as_echo "no" >&6; }
fi
+if false; then
cpu=`uname -m 2>/dev/null`
test -z "$cpu" && cpu=${host_cpu}
case "${host_cpu}" in
@@ -14860,6 +14865,7 @@ $as_echo "no" >&6; }
;;
esac
+fi
else
opt="-Wall"

@ -185,6 +185,7 @@ fi
%changelog %changelog
* Fri Sep 08 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 3.5.28-2 * Fri Sep 08 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 3.5.28-2
- Rebuilt for MSVSphere 9.2 - Rebuilt for MSVSphere 9.2
- Rebuilt for MSVSphere 9.2
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.28-2 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.28-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
@ -284,9 +285,6 @@ fi
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.5.27-7 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.5.27-7
- Escape macros in %%changelog - Escape macros in %%changelog
* Fri Sep 08 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 3.5.28-2
- Rebuilt for MSVSphere 9.2
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.27-6 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.27-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Loading…
Cancel
Save