diff --git a/zxing-3.2.1-deprecated-JCommander-usage.patch b/zxing-3.2.1-deprecated-JCommander-usage.patch new file mode 100644 index 0000000..a79dc7e --- /dev/null +++ b/zxing-3.2.1-deprecated-JCommander-usage.patch @@ -0,0 +1,26 @@ +diff -r -u ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java +--- ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java 2015-08-19 07:21:00.000000000 -0500 ++++ ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java 2018-01-24 08:59:39.472655785 -0600 +@@ -35,7 +35,8 @@ + + public static void main(String[] args) throws Exception { + EncoderConfig config = new EncoderConfig(); +- JCommander jCommander = new JCommander(config, args); ++ JCommander jCommander = new JCommander(config); ++ jCommander.parse(args); + jCommander.setProgramName(CommandLineEncoder.class.getSimpleName()); + if (config.help) { + jCommander.usage(); +diff -r -u ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java +--- ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java 2015-08-19 07:21:00.000000000 -0500 ++++ ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java 2018-01-24 08:59:39.473655761 -0600 +@@ -49,7 +49,8 @@ + + public static void main(String[] args) throws Exception { + DecoderConfig config = new DecoderConfig(); +- JCommander jCommander = new JCommander(config, args); ++ JCommander jCommander = new JCommander(config); ++ jCommander.parse(args); + jCommander.setProgramName(CommandLineRunner.class.getSimpleName()); + if (config.help) { + jCommander.usage(); diff --git a/zxing-3.2.1.tar.gz b/zxing-3.2.1.tar.gz new file mode 100644 index 0000000..46a2e5a Binary files /dev/null and b/zxing-3.2.1.tar.gz differ diff --git a/zxing.spec b/zxing.spec new file mode 100644 index 0000000..cb67579 --- /dev/null +++ b/zxing.spec @@ -0,0 +1,112 @@ +Name: zxing +Version: 3.2.1 +Release: 1 +Summary: Java multi-format 1D/2D bar-code image processing library +License: ASL 2.0 +URL: https://github.com/zxing/zxing/ +Source0: https://github.com/zxing/zxing/archive/%{name}-%{version}.tar.gz +# FTBFS fix manually cherry picked from upstream commit +# https://github.com/zxing/zxing/commit/e2afb336e2f7afaa9d0895c4d16e9e85013c2f3d +Patch0: zxing-3.2.1-deprecated-JCommander-usage.patch +BuildRequires: maven-local mvn(com.beust:jcommander) mvn(junit:junit) +Provides: bundled(barcode4j) +BuildArch: noarch +%description +ZXing ("zebra crossing") is an open-source, +multi-format 1D/2D bar-code image processing library +implemented in Java, with ports to other languages. + +%package javase +Summary: ZXing Java SE extensions +%description javase +Java SE-specific extensions to core ZXing library. + +%package parent +Summary: ZXing Parent POM +%description parent +This package provides ZXing Parent POM. + +%package javadoc +Summary: Javadoc for %{name} +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q -n %{name}-%{name}-%{version} +%patch0 +%pom_remove_dep com.google.android: +%pom_remove_dep :android-core +%pom_remove_dep :android-integration +%pom_disable_module android-core +%pom_disable_module android-integration +%pom_disable_module zxing.appspot.com +%pom_disable_module zxingorg +%pom_remove_plugin -r :maven-site-plugin +%pom_remove_plugin -r :maven-source-plugin +%pom_remove_plugin -r :maven-javadoc-plugin +%pom_remove_plugin -r :maven-dependency-plugin +%pom_remove_plugin -r :maven-release-plugin +%pom_remove_plugin -r :maven-checkstyle-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :apache-rat-plugin +%pom_remove_plugin -r :clirr-maven-plugin +rm -r core/src/test/java/com/google/zxing/qrcode/QRCodeWriterTestCase.java \ + core/src/test/java/com/google/zxing/qrcode/QRCodeBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/datamatrix/DataMatrixBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/pdf417/PDF417BlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/EAN13BlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/Code39BlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/UPCEANExtensionBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/UPCABlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/Code93BlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/UPCEBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/Code128BlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/CodabarBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/ITFBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/negative \ + core/src/test/java/com/google/zxing/oned/EAN8BlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/Code39ExtendedBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/rss/RSS14BlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedStackedBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/aztec/AztecBlackBox*TestCase.java \ + core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java \ + core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedStackedInternalTestCase.java \ + core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2stringTestCase.java \ + core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2binaryTestCase.java \ + core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2resultTestCase.java +sed -i '/DataMatrixBlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/Code39BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/EAN13BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/UPCABlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/UPCABlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/UPCEBlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/PDF417BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/QRCodeBlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/Code128BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/ITFBlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/EAN8BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java +sed -i '/Code39ExtendedBlackBox2TestCase/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java + +%build +%mvn_build -s + +%install +%mvn_install + +%files -f .mfiles-core +%doc AUTHORS CHANGES README.md +%license COPYING NOTICE + +%files javase -f .mfiles-javase +%license COPYING NOTICE + +%files parent -f .mfiles-zxing-parent +%license COPYING NOTICE + +%files javadoc -f .mfiles-javadoc +%license COPYING NOTICE + +%changelog +* Thu Aug 20 2020 maminjie - 3.2.1-1 +- package init diff --git a/zxing.yaml b/zxing.yaml new file mode 100644 index 0000000..aa69bb6 --- /dev/null +++ b/zxing.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: zxing/zxing +tag_prefix: "zxing-" +seperator: "."