Revert "Fop ver. 2.8"

This reverts commit 20c820c74c.

.gitignore

@@ -1,4 +1,7 @@
 /LICENSE-1.1.txt
 /event-model.tgz
+/fop-0.95-src.tar.gz
+/fop-1.1-clean.tar.gz
+/fop-2.0-clean.tar.gz
 /fop-[0-9]*.[0-9]*-src.tar.gz
 /fop-[0-9]*.[0-9]*.pom

0001-Main.patch

@@ -4,7 +4,7 @@ Subject: [PATCH] Main
 
 
 diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java
-index 85665d5..f400fc1 100644
+index b8ba68df9..b14bc831e 100644
 --- a/fop-core/src/main/java/org/apache/fop/cli/Main.java
 +++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java
 @@ -210,11 +210,7 @@ public final class Main {

0002-Use-sRGB.icc-color-profile-from-colord-package.patch

@@ -4,7 +4,7 @@ Subject: [PATCH] Use sRGB.icc color profile from colord package
 
 
 diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
-index 592bc88..cdbc7cf 100644
+index 704898def..1ce14cb4e 100644
 --- a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
 +++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
 @@ -22,7 +22,9 @@ package org.apache.fop.pdf;

0004-Port-to-QDox-2.0.patch

@@ -4,7 +4,7 @@ Subject: [PATCH] Port to QDox 2.0
 
 
 diff --git a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
-index 5428cbb..fef4c2e 100644
+index 2351fc870..64cd7edf0 100644
 --- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
 +++ b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
 @@ -21,6 +21,7 @@ package org.apache.fop.tools;

clean-tarball.sh

@@ -13,6 +13,8 @@ tar xvf ${NAME}-${VERSION}-src.tar.gz
 
 (
   cd ${NAME}-${VERSION}
+  # non-free color profile
+  find src/java/org/apache/fop/pdf/ -name "*.icm*" -delete
   find ./ -name "*.jar" -delete
   find ./ -name "*.pdf" -delete
   # serialized objects

fop.spec

@@ -1,7 +1,7 @@
 Name:           fop
 Summary:        XSL-driven print formatter
-Version:        2.8
-Release:        2%{?dist}
+Version:        2.7
+Release:        4%{?dist}
 # ASL 1.1:
 # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources
 # rest is ASL 2.0
@@ -11,9 +11,10 @@ Source0:        https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%
 Source1:        %{name}.script
 Source2:        batik-pdf-MANIFEST.MF
 Source4:        https://www.apache.org/licenses/LICENSE-1.1.txt
+#Patch0:        fop-xmlunit.patch
 Patch1:		0001-Main.patch
 Patch2:		0002-Use-sRGB.icc-color-profile-from-colord-package.patch
-Patch3:         0003-Port-to-QDox-2.0.patch
+Patch4:         0004-Port-to-QDox-2.0.patch
 
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
@@ -118,12 +119,6 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
-* Wed Nov 16 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.8-2
-- Build from cleaned up tarball
-
-* Wed Nov 16 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.8-1
-- Update to 2.8
-
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
@@ -134,7 +129,7 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name}
 - Rebuilt for java-17-openjdk as system jdk
 
 * Thu Jan 27 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.7-1
-- Update to 2.7
+- Update to 2.6
 
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

sources

@@ -1,2 +1,2 @@
 SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121
-SHA512 (fop-2.8-src.tar.gz) = 965b16cbedb386a2d6b0a8005bba72aa4f14e92259e4889ce49892b4498372a90d57ae4d7bace7425058562b6d0020fd233a303ed2642bfdd2c897ea454f5337
+SHA512 (fop-2.7-src.tar.gz) = bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633