From b50741dc97291874e3d1b20f6ec3875055dbdbda Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 30 Jan 2009 06:41:19 +0000 Subject: [PATCH 01/34] Initialize branch F-10 for xmlenc --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From a4a7d17ff2264869ce7ce80fef7808ac2e2dff9f Mon Sep 17 00:00:00 2001 From: Fabian Deutsch Date: Sun, 1 Feb 2009 18:24:37 +0000 Subject: [PATCH 02/34] Initial commit of xmlenc. --- .cvsignore | 1 + import.log | 1 + sources | 1 + xmlenc.spec | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 import.log create mode 100644 xmlenc.spec diff --git a/.cvsignore b/.cvsignore index e69de29..9f17cf6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xmlenc-0.52.tgz diff --git a/import.log b/import.log new file mode 100644 index 0000000..a9f2117 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xmlenc-0_52-5_fc9:HEAD:xmlenc-0.52-5.fc9.src.rpm:1233512606 diff --git a/sources b/sources index e69de29..5208a6f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +32f631dca735574c9ad8164ee05dc05f xmlenc-0.52.tgz diff --git a/xmlenc.spec b/xmlenc.spec new file mode 100644 index 0000000..bc054b9 --- /dev/null +++ b/xmlenc.spec @@ -0,0 +1,89 @@ +Name: xmlenc +Version: 0.52 +Release: 5%{?dist} +Summary: Light-weight XML output library for Java + +Group: Development/Libraries +License: BSD +URL: http://xmlenc.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: ant +BuildRequires: ant-junit +BuildRequires: junit + +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +BuildArch: noarch + +%description +This library is a fast stream-based XML output library for Java. +Main design goals are performance, simplicitity and pureness. + + +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name} + + +%prep +%setup -q +find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \; +rm -Rf build/* + + +%build +ant \ + -Djavac.targetvm=1.5 \ + all + + +%install +rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_javadir}/ +cp -pR build/%{name}.jar %{buildroot}%{_javadir}/ + +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pR build/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{_javadir}/* +%doc CHANGES COPYRIGHT README THANKS + + +%files javadoc +%defattr(-,root,root,-) +%{_javadocdir}/%{name}-%{version} + + +%changelog +* Tue Jan 29 2009 Fabian Deutsch 0.52-5 +- URL now follows standards + +* Wed Jan 28 2009 Fabian Deutsch 0.52-4 +- Group name fix +- Spec-file cleanup + +* Mon Jan 26 2009 Fabian Deutsch 0.52-3 +- Small javac.targetvm build fix + +* Mon Jan 26 2009 Fabian Deutsch 0.52-2 +- Added dependencies +- Small fixes + +* Wed Jan 21 2009 Fabian Deutsch 0.52-1 +- Initial package. From 1f12ebf8bee3bb40e592edb3fa5ac886b75d5eb3 Mon Sep 17 00:00:00 2001 From: Fabian Deutsch Date: Sun, 1 Feb 2009 18:27:20 +0000 Subject: [PATCH 03/34] Included xmelnc in F-10 branch. --- sources | 1 + xmlenc.spec | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 xmlenc.spec diff --git a/sources b/sources index e69de29..5208a6f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +32f631dca735574c9ad8164ee05dc05f xmlenc-0.52.tgz diff --git a/xmlenc.spec b/xmlenc.spec new file mode 100644 index 0000000..bc054b9 --- /dev/null +++ b/xmlenc.spec @@ -0,0 +1,89 @@ +Name: xmlenc +Version: 0.52 +Release: 5%{?dist} +Summary: Light-weight XML output library for Java + +Group: Development/Libraries +License: BSD +URL: http://xmlenc.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: ant +BuildRequires: ant-junit +BuildRequires: junit + +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +BuildArch: noarch + +%description +This library is a fast stream-based XML output library for Java. +Main design goals are performance, simplicitity and pureness. + + +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name} + + +%prep +%setup -q +find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \; +rm -Rf build/* + + +%build +ant \ + -Djavac.targetvm=1.5 \ + all + + +%install +rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_javadir}/ +cp -pR build/%{name}.jar %{buildroot}%{_javadir}/ + +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pR build/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{_javadir}/* +%doc CHANGES COPYRIGHT README THANKS + + +%files javadoc +%defattr(-,root,root,-) +%{_javadocdir}/%{name}-%{version} + + +%changelog +* Tue Jan 29 2009 Fabian Deutsch 0.52-5 +- URL now follows standards + +* Wed Jan 28 2009 Fabian Deutsch 0.52-4 +- Group name fix +- Spec-file cleanup + +* Mon Jan 26 2009 Fabian Deutsch 0.52-3 +- Small javac.targetvm build fix + +* Mon Jan 26 2009 Fabian Deutsch 0.52-2 +- Added dependencies +- Small fixes + +* Wed Jan 21 2009 Fabian Deutsch 0.52-1 +- Initial package. From 1373946e6e6875079a245e16eefe86f8fc448977 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 09:59:42 +0000 Subject: [PATCH 04/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index bc054b9..c2b87cd 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.52 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0.52-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Jan 29 2009 Fabian Deutsch 0.52-5 - URL now follows standards From 0cbf3f1a4281ff4b3db1d5295928976314bf9a5e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:11:14 +0000 Subject: [PATCH 05/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index c2b87cd..800730a 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.52 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.52-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 0.52-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From dabaf97c3869539eed6c6559777af08e76346116 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:00 +0000 Subject: [PATCH 06/34] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 345105b..fc84267 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xmlenc -# $Id$ +# $Id: Makefile,v 1.1 2009/01/30 06:41:17 kevin Exp $ NAME := xmlenc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f74a2ac49b5ed46f2cb2d3832d8187ccc307dfb7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:15 +0000 Subject: [PATCH 07/34] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 345105b..8e32460 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xmlenc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 396f46f3114ec2df076adfb85bd92a179390f282 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:56:14 +0000 Subject: [PATCH 08/34] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fc84267..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlenc -# $Id: Makefile,v 1.1 2009/01/30 06:41:17 kevin Exp $ -NAME := xmlenc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index a9f2117..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xmlenc-0_52-5_fc9:HEAD:xmlenc-0.52-5.fc9.src.rpm:1233512606 From 9496f287c872fd0a92f298d8974d1064303e7eb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:56:14 +0000 Subject: [PATCH 09/34] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8e32460..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlenc -# $Id$ -NAME := xmlenc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 From 4b842a222b676b1dd0967c057a1d4dbefad551d3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:30:13 -0600 Subject: [PATCH 10/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 800730a..c51c729 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.52 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.52-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jul 27 2009 Fedora Release Engineering - 0.52-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 6e237cae33adbfcd912707fff7592b4965b1b807 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:03:34 -0600 Subject: [PATCH 11/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index c51c729..a207fe2 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.52 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.52-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0.52-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From edb19bfc284457f1c50ee5b5e4808df0696cadc6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:50:56 -0500 Subject: [PATCH 12/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index a207fe2..5d2dd1d 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.52 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.52-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.52-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 80fd49e2b1ee2de92e3a424288d9a7eaeaf9c552 Mon Sep 17 00:00:00 2001 From: gil Date: Sat, 29 Sep 2012 07:14:07 +0200 Subject: [PATCH 13/34] Adapted to current guideline Added maven pom Added %%pre javadoc script --- xmlenc-0.52-build.patch | 19 +++++++++ xmlenc-0.52.pom | 21 ++++++++++ xmlenc.spec | 91 +++++++++++++++++++++-------------------- 3 files changed, 87 insertions(+), 44 deletions(-) create mode 100644 xmlenc-0.52-build.patch create mode 100644 xmlenc-0.52.pom diff --git a/xmlenc-0.52-build.patch b/xmlenc-0.52-build.patch new file mode 100644 index 0000000..9787013 --- /dev/null +++ b/xmlenc-0.52-build.patch @@ -0,0 +1,19 @@ +--- build.xml 2005-12-23 12:16:03.000000000 +0100 ++++ build.xml-gil 2012-09-25 20:47:04.972937559 +0200 +@@ -104,7 +104,7 @@ + + + +- ++ + + + +@@ -151,6 +151,7 @@ + debug="${javac.debug}" + deprecation="${javac.deprecation}" + optimize="${javac.optimize}" ++ source="${javac.targetvm}" + target="${javac.targetvm}" /> + +
diff --git a/xmlenc-0.52.pom b/xmlenc-0.52.pom new file mode 100644 index 0000000..f7f6b85 --- /dev/null +++ b/xmlenc-0.52.pom @@ -0,0 +1,21 @@ + + + 4.0.0 + xmlenc + xmlenc + 0.52 + jar + xmlenc Library + http://xmlenc.sourceforge.net + xmlenc Library + + + The BSD License + http://www.opensource.org/licenses/bsd-license.php + repo + + + + http://xmlenc.cvs.sourceforge.net/xmlenc/ + + \ No newline at end of file diff --git a/xmlenc.spec b/xmlenc.spec index 5d2dd1d..146455f 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,76 +1,79 @@ -Name: xmlenc -Version: 0.52 -Release: 10%{?dist} -Summary: Light-weight XML output library for Java +Name: xmlenc +Version: 0.52 +Release: 11%{?dist} +Summary: Light-weight XML output library for Java +Group: Development/Libraries +License: BSD +URL: http://xmlenc.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom +# set javac target/source to 1.5 +Patch0: %{name}-%{version}-build.patch -Group: Development/Libraries -License: BSD -URL: http://xmlenc.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: ant +BuildRequires: ant-junit +BuildRequires: junit -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils -BuildRequires: ant -BuildRequires: ant-junit -BuildRequires: junit - -Requires: java >= 1:1.6.0 -Requires: jpackage-utils -BuildArch: noarch +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +BuildArch: noarch %description This library is a fast stream-based XML output library for Java. -Main design goals are performance, simplicitity and pureness. - +Main design goals are performance, simplicity and pureness. %package javadoc -Summary: Javadocs for %{name} -Group: Documentation -Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils +Summary: Javadocs for %{name} +Group: Documentation +Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name} - %prep %setup -q -find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \; +find -name '*.jar' -o -name '*.class' -delete rm -Rf build/* - +%patch0 -p0 %build -ant \ - -Djavac.targetvm=1.5 \ - all +%ant all %install -rm -rf %{buildroot} + install -d -m 755 %{buildroot}%{_javadir}/ -cp -pR build/%{name}.jar %{buildroot}%{_javadir}/ +install -m 644 build/%{name}.jar %{buildroot}%{_javadir}/ -install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pR build/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ - - -%clean -rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pR build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ %files -%defattr(-,root,root,-) -%{_javadir}/* +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} %doc CHANGES COPYRIGHT README THANKS +%pre javadoc +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name}-%{version} - +%{_javadocdir}/%{name} +%doc COPYRIGHT %changelog +* Tue Sep 25 2012 gil 0.52-11 +- Adapted to current guideline +- Added maven pom +- Added %%pre javadoc script + * Sun Jul 22 2012 Fedora Release Engineering - 0.52-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild @@ -101,4 +104,4 @@ rm -rf %{buildroot} - Small fixes * Wed Jan 21 2009 Fabian Deutsch 0.52-1 -- Initial package. +- Initial package. \ No newline at end of file From 104496e018507857d024149f91df2665b36b7842 Mon Sep 17 00:00:00 2001 From: gil Date: Sat, 3 Nov 2012 08:52:30 +0100 Subject: [PATCH 14/34] Update to 0.53 --- .gitignore | 1 + sources | 2 +- xmlenc.spec | 65 +++++++++++++++++++++++++++++++---------------------- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 9f17cf6..c44094f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xmlenc-0.52.tgz +/xmlenc-0.53-src-git.tar.xz diff --git a/sources b/sources index 5208a6f..33a31b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -32f631dca735574c9ad8164ee05dc05f xmlenc-0.52.tgz +fa453d6ed025e2e06fec125f360601bf xmlenc-0.53-src-git.tar.xz diff --git a/xmlenc.spec b/xmlenc.spec index 146455f..214ae0d 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,21 +1,32 @@ Name: xmlenc -Version: 0.52 -Release: 11%{?dist} +Version: 0.53 +Release: 1%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries License: BSD -URL: http://xmlenc.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz -Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom -# set javac target/source to 1.5 -Patch0: %{name}-%{version}-build.patch +# http://xmlenc.sourceforge.net/ +URL: https://github.com/znerd/xmlenc/ +# git clone git://github.com/znerd/xmlenc.git xmlenc-0.53 +# (cd xmlenc-0.53/ && git archive --format=tar --prefix=xmlenc-0.53/ xmlenc-0.53 | xz > ../xmlenc-0.53-src-git.tar.xz) +Source0: %{name}-%{version}-src-git.tar.xz BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils -BuildRequires: ant -BuildRequires: ant-junit +BuildRequires: znerd-oss-parent + +# test deps BuildRequires: junit +BuildRequires: maven +BuildRequires: maven-compiler-plugin +BuildRequires: maven-enforcer-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-resources-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit4 + Requires: java >= 1:1.6.0 Requires: jpackage-utils BuildArch: noarch @@ -25,7 +36,7 @@ This library is a fast stream-based XML output library for Java. Main design goals are performance, simplicity and pureness. %package javadoc -Summary: Javadocs for %{name} +Summary: Javadoc for %{name} Group: Documentation Requires: jpackage-utils @@ -34,41 +45,41 @@ This package contains the API documentation for %{name} %prep %setup -q -find -name '*.jar' -o -name '*.class' -delete -rm -Rf build/* -%patch0 -p0 +find . -name "*.class" -delete +find . -name ".*" -delete +find . -name "*.jar" -type f -delete %build -%ant all +mvn-rpmbuild install javadoc:aggregate %install -install -d -m 755 %{buildroot}%{_javadir}/ -install -m 644 build/%{name}.jar %{buildroot}%{_javadir}/ +mkdir -p %{buildroot}%{_javadir} +install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar +mkdir -p %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name}" -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pR build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %files %{_javadir}/%{name}.jar %{_mavenpomdir}/JPP-%{name}.pom %{_mavendepmapfragdir}/%{name} -%doc CHANGES COPYRIGHT README THANKS - -%pre javadoc -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : +%doc CHANGES.txt COPYRIGHT.txt README.txt THANKS.txt %files javadoc %{_javadocdir}/%{name} -%doc COPYRIGHT +%doc COPYRIGHT.txt %changelog +* Sat Sep 29 2012 gil cattaneo 0.53-1 +- Update to 0.53 +- Moved to maven build + * Tue Sep 25 2012 gil 0.52-11 - Adapted to current guideline - Added maven pom From 8dd3d47c251b1a6d84cb83482d71761f4dd18d5a Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 6 Feb 2013 20:49:41 +0100 Subject: [PATCH 15/34] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local --- xmlenc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlenc.spec b/xmlenc.spec index 214ae0d..f3dbb31 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries License: BSD @@ -17,7 +17,7 @@ BuildRequires: znerd-oss-parent # test deps BuildRequires: junit -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-install-plugin @@ -76,6 +76,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %doc COPYRIGHT.txt %changelog +* Wed Feb 06 2013 Java SIG - 0.53-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Sat Sep 29 2012 gil cattaneo 0.53-1 - Update to 0.53 - Moved to maven build From 10a50654690e0289d2088fa78c9fc94386aa8200 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:49:56 -0600 Subject: [PATCH 16/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index f3dbb31..ab56488 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries License: BSD @@ -76,6 +76,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %doc COPYRIGHT.txt %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.53-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Feb 06 2013 Java SIG - 0.53-2 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local From 521067b4c1c7d3eceb127b22be362a6e311752ba Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 19 Feb 2013 06:28:29 +0100 Subject: [PATCH 17/34] added maven-common-artifact-filters and maven-shared-components as BR --- xmlenc.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index ab56488..88743ec 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Light-weight XML output library for Java Group: Development/Libraries License: BSD @@ -26,6 +26,9 @@ BuildRequires: maven-javadoc-plugin BuildRequires: maven-resources-plugin BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 +# required by enforcer-plugin +BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) Requires: java >= 1:1.6.0 Requires: jpackage-utils @@ -76,6 +79,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %doc COPYRIGHT.txt %changelog +* Tue Feb 19 2013 gil cattaneo 0.53-4 +- added maven-common-artifact-filters and maven-shared-components as BR + * Fri Feb 15 2013 Fedora Release Engineering - 0.53-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 90d9868a3147cc56c146aca3f0ad818d2d3489e3 Mon Sep 17 00:00:00 2001 From: gil Date: Mon, 1 Jul 2013 15:24:43 +0200 Subject: [PATCH 18/34] switch to XMvn, minor changes to adapt to current guideline --- .gitignore | 1 + sources | 2 +- xmlenc.spec | 53 +++++++++++++++-------------------------------------- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index c44094f..de8815c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xmlenc-0.52.tgz /xmlenc-0.53-src-git.tar.xz +/xmlenc-0.53.tar.gz diff --git a/sources b/sources index 33a31b1..4103d6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa453d6ed025e2e06fec125f360601bf xmlenc-0.53-src-git.tar.xz +4a5200a4e1e8d5c86c84b15e95814d90 xmlenc-0.53.tar.gz diff --git a/xmlenc.spec b/xmlenc.spec index 88743ec..81e0b18 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,37 +1,25 @@ Name: xmlenc Version: 0.53 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Light-weight XML output library for Java -Group: Development/Libraries License: BSD # http://xmlenc.sourceforge.net/ URL: https://github.com/znerd/xmlenc/ -# git clone git://github.com/znerd/xmlenc.git xmlenc-0.53 -# (cd xmlenc-0.53/ && git archive --format=tar --prefix=xmlenc-0.53/ xmlenc-0.53 | xz > ../xmlenc-0.53-src-git.tar.xz) -Source0: %{name}-%{version}-src-git.tar.xz +Source0: https://github.com/znerd/xmlenc/archive/%{name}-%{version}.tar.gz BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils -BuildRequires: znerd-oss-parent +BuildRequires: mvn(org.znerd:znerd-oss-parent) # test deps -BuildRequires: junit +BuildRequires: mvn(junit:junit) BuildRequires: maven-local -BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 # required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) - -Requires: java >= 1:1.6.0 -Requires: jpackage-utils +Requires: java-devel >= 1:1.6.0 BuildArch: noarch %description @@ -40,45 +28,34 @@ Main design goals are performance, simplicity and pureness. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name} %prep -%setup -q +%setup -q -n %{name}-%{name}-%{version} find . -name "*.class" -delete find . -name ".*" -delete find . -name "*.jar" -type f -delete -%build +%mvn_file :%{name} %{name} -mvn-rpmbuild install javadoc:aggregate +%build +%mvn_build %install +%mvn_install -mkdir -p %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name}" - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ - -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc CHANGES.txt COPYRIGHT.txt README.txt THANKS.txt -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc COPYRIGHT.txt %changelog +* Mon Jul 01 2013 gil cattaneo 0.53-5 +- switch to XMvn, minor changes to adapt to current guideline + * Tue Feb 19 2013 gil cattaneo 0.53-4 - added maven-common-artifact-filters and maven-shared-components as BR From e2036f8cc09bec45ce03e72c57fcb22427ed84fe Mon Sep 17 00:00:00 2001 From: gil Date: Mon, 1 Jul 2013 15:28:11 +0200 Subject: [PATCH 19/34] fix requires --- xmlenc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlenc.spec b/xmlenc.spec index 81e0b18..316deae 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -19,7 +19,7 @@ BuildRequires: maven-surefire-provider-junit4 # required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) -Requires: java-devel >= 1:1.6.0 +Requires: java >= 1:1.6.0 BuildArch: noarch %description @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %doc COPYRIGHT.txt %changelog +* Mon Jul 01 2013 gil cattaneo 0.53-6 +- fix requires + * Mon Jul 01 2013 gil cattaneo 0.53-5 - switch to XMvn, minor changes to adapt to current guideline From d8c16b76d8c643ba96fc42d4619e6fe229f8270d Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 16 Jul 2013 17:59:01 +0200 Subject: [PATCH 20/34] fix alias --- xmlenc.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xmlenc.spec b/xmlenc.spec index 316deae..b6623ed 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -34,13 +34,15 @@ This package contains the API documentation for %{name} %prep %setup -q -n %{name}-%{name}-%{version} + find . -name "*.class" -delete find . -name ".*" -delete find . -name "*.jar" -type f -delete -%mvn_file :%{name} %{name} - %build + +%mvn_file : %{name} +%mvn_alias : "%{name}:%{name}" %mvn_build %install @@ -53,6 +55,9 @@ find . -name "*.jar" -type f -delete %doc COPYRIGHT.txt %changelog +* Tue Jul 16 2013 gil cattaneo 0.53-7 +- fix alias, thanks to Robert Rati + * Mon Jul 01 2013 gil cattaneo 0.53-6 - fix requires From 4837a43f3141188bc083239b9b87a95b020f648c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:29:48 -0500 Subject: [PATCH 21/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index b6623ed..59222db 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -55,6 +55,9 @@ find . -name "*.jar" -type f -delete %doc COPYRIGHT.txt %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.53-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 16 2013 gil cattaneo 0.53-7 - fix alias, thanks to Robert Rati From a0d8e027b31c42eb04d3e2138dc374eeaa145ab3 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 28 Mar 2014 14:25:55 +0100 Subject: [PATCH 22/34] Use Requires: java-headless rebuild (#1067528) Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- xmlenc.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xmlenc.spec b/xmlenc.spec index 59222db..3289a67 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -19,7 +19,6 @@ BuildRequires: maven-surefire-provider-junit4 # required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) -Requires: java >= 1:1.6.0 BuildArch: noarch %description @@ -55,6 +54,9 @@ find . -name "*.jar" -type f -delete %doc COPYRIGHT.txt %changelog +* Fri Mar 28 2014 Michael Simacek - 0.53-9 +- Use Requires: java-headless rebuild (#1067528) + * Sun Aug 04 2013 Fedora Release Engineering - 0.53-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a8ed0e358884e35daa53e50e7a43a25cbd735633 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:06:18 -0500 Subject: [PATCH 23/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 3289a67..5e278eb 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -54,6 +54,9 @@ find . -name "*.jar" -type f -delete %doc COPYRIGHT.txt %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.53-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Mar 28 2014 Michael Simacek - 0.53-9 - Use Requires: java-headless rebuild (#1067528) From 13a7777c97156f134db58fdb68620f9fda41647a Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 10 Jun 2014 14:19:58 +0200 Subject: [PATCH 24/34] fix BR list --- xmlenc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmlenc.spec b/xmlenc.spec index 5e278eb..acfd66f 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -8,17 +8,17 @@ URL: https://github.com/znerd/xmlenc/ Source0: https://github.com/znerd/xmlenc/archive/%{name}-%{version}.tar.gz BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: mvn(org.znerd:znerd-oss-parent) +BuildRequires: mvn(org.znerd:znerd-oss-parent:pom:) # test deps BuildRequires: mvn(junit:junit) BuildRequires: maven-local BuildRequires: maven-enforcer-plugin -BuildRequires: maven-surefire-provider-junit4 +BuildRequires: maven-surefire-provider-junit # required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch %description From 7686f71664db81caa3f954f87c0c38a445b1201b Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 13 Feb 2015 19:15:40 +0100 Subject: [PATCH 25/34] introduce license macro --- xmlenc.spec | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/xmlenc.spec b/xmlenc.spec index acfd66f..b11ae01 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,21 +1,18 @@ Name: xmlenc Version: 0.53 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ URL: https://github.com/znerd/xmlenc/ Source0: https://github.com/znerd/xmlenc/archive/%{name}-%{version}.tar.gz -BuildRequires: java-devel >= 1:1.6.0 BuildRequires: mvn(org.znerd:znerd-oss-parent:pom:) - # test deps BuildRequires: mvn(junit:junit) BuildRequires: maven-local BuildRequires: maven-enforcer-plugin -BuildRequires: maven-surefire-provider-junit # required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) @@ -38,22 +35,27 @@ find . -name "*.class" -delete find . -name ".*" -delete find . -name "*.jar" -type f -delete -%build - %mvn_file : %{name} %mvn_alias : "%{name}:%{name}" + +%build + %mvn_build %install %mvn_install %files -f .mfiles -%doc CHANGES.txt COPYRIGHT.txt README.txt THANKS.txt +%doc CHANGES.txt README.txt THANKS.txt +%license COPYRIGHT.txt %files javadoc -f .mfiles-javadoc -%doc COPYRIGHT.txt +%license COPYRIGHT.txt %changelog +* Fri Feb 13 2015 gil cattaneo 0.53-11 +- introduce license macro + * Sun Jun 08 2014 Fedora Release Engineering - 0.53-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -121,4 +123,4 @@ find . -name "*.jar" -type f -delete - Small fixes * Wed Jan 21 2009 Fabian Deutsch 0.52-1 -- Initial package. \ No newline at end of file +- Initial package. From 4f837c2c8e5f204f16092c5f207bd2659af0640e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:08:45 +0000 Subject: [PATCH 26/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index b11ae01..9d8c027 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %license COPYRIGHT.txt %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.53-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Feb 13 2015 gil cattaneo 0.53-11 - introduce license macro From ce91d101e2caae95b76feb497c3dd0b608b7d3a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:35:58 +0000 Subject: [PATCH 27/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 9d8c027..09106a8 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %license COPYRIGHT.txt %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.53-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0.53-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 36813826b0e2e92667ba47a4d8a6681157b7135e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:57:20 +0000 Subject: [PATCH 28/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 09106a8..18fbe73 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %license COPYRIGHT.txt %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.53-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0.53-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From bd4a1643efcdd6b48fb4ffcb4f3a3ba6daf3c084 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:13:23 +0000 Subject: [PATCH 29/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 18fbe73..19398d4 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %license COPYRIGHT.txt %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.53-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.53-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 562611ee77b9a7250c291d91c32ecd7111e990cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:46:50 +0000 Subject: [PATCH 30/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 19398d4..74091c6 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %license COPYRIGHT.txt %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.53-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.53-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b499078927847f65a56cc18e49f7ce24b19b3a93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:23:23 +0000 Subject: [PATCH 31/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 74091c6..5ba82bf 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %license COPYRIGHT.txt %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.53-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.53-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a7e43c44a842cc2fdf6adc10eb17ad6a110b1332 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:32:57 +0000 Subject: [PATCH 32/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 5ba82bf..9cfc067 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %license COPYRIGHT.txt %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.53-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.53-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d2642e1c982934fc989fa54b9be6326a46118047 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:20:37 +0000 Subject: [PATCH 33/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlenc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlenc.spec b/xmlenc.spec index 9cfc067..6e97328 100644 --- a/xmlenc.spec +++ b/xmlenc.spec @@ -1,6 +1,6 @@ Name: xmlenc Version: 0.53 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Light-weight XML output library for Java License: BSD # http://xmlenc.sourceforge.net/ @@ -53,6 +53,9 @@ find . -name "*.jar" -type f -delete %license COPYRIGHT.txt %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.53-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.53-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dfca120cebfe92d2d82668cff09576bd10289b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 11 Sep 2019 12:55:24 +0200 Subject: [PATCH 34/34] Orphaned for 6+ weeks --- .gitignore | 3 - dead.package | 1 + sources | 1 - xmlenc-0.52-build.patch | 19 ----- xmlenc-0.52.pom | 21 ------ xmlenc.spec | 150 ---------------------------------------- 6 files changed, 1 insertion(+), 194 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xmlenc-0.52-build.patch delete mode 100644 xmlenc-0.52.pom delete mode 100644 xmlenc.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index de8815c..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -xmlenc-0.52.tgz -/xmlenc-0.53-src-git.tar.xz -/xmlenc-0.53.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 4103d6d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -4a5200a4e1e8d5c86c84b15e95814d90 xmlenc-0.53.tar.gz diff --git a/xmlenc-0.52-build.patch b/xmlenc-0.52-build.patch deleted file mode 100644 index 9787013..0000000 --- a/xmlenc-0.52-build.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- build.xml 2005-12-23 12:16:03.000000000 +0100 -+++ build.xml-gil 2012-09-25 20:47:04.972937559 +0200 -@@ -104,7 +104,7 @@ - - - -- -+ - - - -@@ -151,6 +151,7 @@ - debug="${javac.debug}" - deprecation="${javac.deprecation}" - optimize="${javac.optimize}" -+ source="${javac.targetvm}" - target="${javac.targetvm}" /> - -
diff --git a/xmlenc-0.52.pom b/xmlenc-0.52.pom deleted file mode 100644 index f7f6b85..0000000 --- a/xmlenc-0.52.pom +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - xmlenc - xmlenc - 0.52 - jar - xmlenc Library - http://xmlenc.sourceforge.net - xmlenc Library - - - The BSD License - http://www.opensource.org/licenses/bsd-license.php - repo - - - - http://xmlenc.cvs.sourceforge.net/xmlenc/ - - \ No newline at end of file diff --git a/xmlenc.spec b/xmlenc.spec deleted file mode 100644 index 6e97328..0000000 --- a/xmlenc.spec +++ /dev/null @@ -1,150 +0,0 @@ -Name: xmlenc -Version: 0.53 -Release: 19%{?dist} -Summary: Light-weight XML output library for Java -License: BSD -# http://xmlenc.sourceforge.net/ -URL: https://github.com/znerd/xmlenc/ -Source0: https://github.com/znerd/xmlenc/archive/%{name}-%{version}.tar.gz - -BuildRequires: mvn(org.znerd:znerd-oss-parent:pom:) -# test deps -BuildRequires: mvn(junit:junit) - -BuildRequires: maven-local -BuildRequires: maven-enforcer-plugin -# required by enforcer-plugin -BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) -BuildArch: noarch - -%description -This library is a fast stream-based XML output library for Java. -Main design goals are performance, simplicity and pureness. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains the API documentation for %{name} - -%prep -%setup -q -n %{name}-%{name}-%{version} - -find . -name "*.class" -delete -find . -name ".*" -delete -find . -name "*.jar" -type f -delete - -%mvn_file : %{name} -%mvn_alias : "%{name}:%{name}" - -%build - -%mvn_build - -%install -%mvn_install - -%files -f .mfiles -%doc CHANGES.txt README.txt THANKS.txt -%license COPYRIGHT.txt - -%files javadoc -f .mfiles-javadoc -%license COPYRIGHT.txt - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 0.53-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.53-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.53-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.53-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.53-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.53-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.53-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.53-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 13 2015 gil cattaneo 0.53-11 -- introduce license macro - -* Sun Jun 08 2014 Fedora Release Engineering - 0.53-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 0.53-9 -- Use Requires: java-headless rebuild (#1067528) - -* Sun Aug 04 2013 Fedora Release Engineering - 0.53-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 16 2013 gil cattaneo 0.53-7 -- fix alias, thanks to Robert Rati - -* Mon Jul 01 2013 gil cattaneo 0.53-6 -- fix requires - -* Mon Jul 01 2013 gil cattaneo 0.53-5 -- switch to XMvn, minor changes to adapt to current guideline - -* Tue Feb 19 2013 gil cattaneo 0.53-4 -- added maven-common-artifact-filters and maven-shared-components as BR - -* Fri Feb 15 2013 Fedora Release Engineering - 0.53-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 0.53-2 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Sat Sep 29 2012 gil cattaneo 0.53-1 -- Update to 0.53 -- Moved to maven build - -* Tue Sep 25 2012 gil 0.52-11 -- Adapted to current guideline -- Added maven pom -- Added %%pre javadoc script - -* Sun Jul 22 2012 Fedora Release Engineering - 0.52-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.52-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.52-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jul 27 2009 Fedora Release Engineering - 0.52-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0.52-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jan 29 2009 Fabian Deutsch 0.52-5 -- URL now follows standards - -* Wed Jan 28 2009 Fabian Deutsch 0.52-4 -- Group name fix -- Spec-file cleanup - -* Mon Jan 26 2009 Fabian Deutsch 0.52-3 -- Small javac.targetvm build fix - -* Mon Jan 26 2009 Fabian Deutsch 0.52-2 -- Added dependencies -- Small fixes - -* Wed Jan 21 2009 Fabian Deutsch 0.52-1 -- Initial package.