From aa4ad1520a4a2795e97d6a6d1d104a3a23289b4a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 29 Jan 2008 17:52:41 +0000 Subject: [PATCH 01/59] Initialize branch F-7 for xmlcopyeditor --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 8571ca8dcc5fba8fc71cedc8d829c1b2c64c1baa Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Tue, 29 Jan 2008 19:52:34 +0000 Subject: [PATCH 02/59] Initial import --- .cvsignore | 1 + sources | 1 + xmlcopyeditor-1.1.0.6-defaultbrowser.patch | 32 ++++++++++ xmlcopyeditor-1.1.0.6-nuke.patch | 58 ++++++++++++++++++ xmlcopyeditor.spec | 71 ++++++++++++++++++++++ 5 files changed, 163 insertions(+) create mode 100644 xmlcopyeditor-1.1.0.6-defaultbrowser.patch create mode 100644 xmlcopyeditor-1.1.0.6-nuke.patch create mode 100644 xmlcopyeditor.spec diff --git a/.cvsignore b/.cvsignore index e69de29..d73f97e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xmlcopyeditor-1.1.0.6.tar.gz diff --git a/sources b/sources index e69de29..4c473d5 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +29350234faca3ad978ff74dbbf7f3ef5 xmlcopyeditor-1.1.0.6.tar.gz diff --git a/xmlcopyeditor-1.1.0.6-defaultbrowser.patch b/xmlcopyeditor-1.1.0.6-defaultbrowser.patch new file mode 100644 index 0000000..3484897 --- /dev/null +++ b/xmlcopyeditor-1.1.0.6-defaultbrowser.patch @@ -0,0 +1,32 @@ +diff -up xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp.defaultbrowser xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp +--- xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp.defaultbrowser 2008-01-28 02:38:06.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp 2008-01-28 09:48:46.000000000 -0500 +@@ -1015,17 +1015,18 @@ MyFrame::~MyFrame() + wxString MyFrame::getLinuxBrowser() + { + wxString s; +- const int stringArrayLen = 9; ++ const int stringArrayLen = 10; + wxString stringArray[stringArrayLen]; +- stringArray[0] = _T ( "/usr/bin/firefox" ); +- stringArray[1] = _T ( "/usr/bin/mozilla" ); +- stringArray[2] = _T ( "/usr/bin/opera" ); +- stringArray[3] = _T ( "/usr/bin/dillo" ); +- stringArray[4] = _T ( "/opt/gnome/bin/epiphany" ); +- stringArray[5] = _T ( "/opt/gnome/bin/galeon" ); +- stringArray[6] = _T ( "/opt/kde/bin/konqueror" ); +- stringArray[7] = _T ( "/opt/mozilla/bin/firefox" ); +- stringArray[8] = wxEmptyString; // empty option is safe ++ stringArray[0] = _T ( "/usr/bin/xdg-open" ); ++ stringArray[1] = _T ( "/usr/bin/htmlview" ); ++ stringArray[2] = _T ( "/usr/bin/galeon" ); ++ stringArray[3] = _T ( "/usr/bin/epiphany" ); ++ stringArray[4] = _T ( "/usr/bin/firefox" ); ++ stringArray[5] = _T ( "/usr/bin/mozilla" ); ++ stringArray[6] = _T ( "/usr/bin/konqueror" ); ++ stringArray[7] = _T ( "/usr/bin/opera" ); ++ stringArray[8] = _T ( "/usr/bin/dillo" ); ++ stringArray[9] = wxEmptyString; // empty option is safe + + for ( int i = 0; i < stringArrayLen; i++ ) + { diff --git a/xmlcopyeditor-1.1.0.6-nuke.patch b/xmlcopyeditor-1.1.0.6-nuke.patch new file mode 100644 index 0000000..bc2a79c --- /dev/null +++ b/xmlcopyeditor-1.1.0.6-nuke.patch @@ -0,0 +1,58 @@ +diff -up xmlcopyeditor-1.1.0.6/src/Makefile.in.nuke xmlcopyeditor-1.1.0.6/src/Makefile.in +--- xmlcopyeditor-1.1.0.6/src/Makefile.in.nuke 2008-01-29 03:03:11.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/Makefile.in 2008-01-29 03:03:59.000000000 -0500 +@@ -241,24 +241,7 @@ nobase_xmlcopyeditor_DATA = png/*.png \ + rng/modules/*.rng \ + xpm/*.xpm \ + templates/*.* \ +- help/*.* help/html/*.* \ +- copying/*.txt copying/boost_shared_ptr/* \ +- copying/Expat/* copying/libxml2/* copying/libxslt/* \ +- copying/PCRE/* copying/Scintilla/* \ +- copying/scowl/* \ +- copying/wxStyledTextCtrl/* copying/ximian/* \ +- copying/wxStEditor/* \ +- copying/xmlcopyeditor/* \ +- copying/Aspell/* \ +- copying/Apache/LICENSE-2.0 \ +- copying/Apache/LICENSE-2_files/* \ +- po/sk/messages.mo \ +- po/sv/messages.mo \ +- po/fr/messages.mo \ +- po/de/messages.mo \ +- po/zh_CN/messages.mo \ +- po/zh_TW/messages.mo \ +- po/en_us/messages.po ++ help/*.* help/html/*.* + + pixmap_DATA = xmlcopyeditor.png + applications_DATA = xmlcopyeditor.desktop +diff -up xmlcopyeditor-1.1.0.6/src/Makefile.am.nuke xmlcopyeditor-1.1.0.6/src/Makefile.am +--- xmlcopyeditor-1.1.0.6/src/Makefile.am.nuke 2008-01-29 03:03:06.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/Makefile.am 2008-01-29 03:03:41.000000000 -0500 +@@ -50,25 +50,6 @@ nobase_xmlcopyeditor_DATA = png/*.png \ + templates/*.lzx \ + templates/*.xlf \ + help/*.* help/html/*.* \ +- copying/*.txt copying/boost_shared_ptr/* \ +- copying/Expat/* copying/libxml2/* copying/libxslt/* \ +- copying/PCRE/* copying/Scintilla/* \ +- copying/scowl/* \ +- copying/wxStyledTextCtrl/* copying/ximian/* \ +- copying/wxStEditor/* \ +- copying/xmlcopyeditor/* \ +- copying/Aspell/* \ +- copying/Apache/LICENSE-2.0 \ +- copying/Apache/LICENSE-2_files/* \ +- po/sk/messages.mo \ +- po/sv/messages.mo \ +- po/fr/messages.mo \ +- po/de/messages.mo \ +- po/zh_CN/messages.mo \ +- po/zh_TW/messages.mo \ +- po/uk_UA/messages.mo \ +- po/uk_UA/messages.mo \ +- po/en_us/messages.po \ + + pixmap_DATA = xmlcopyeditor.png + diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec new file mode 100644 index 0000000..cd0bd0d --- /dev/null +++ b/xmlcopyeditor.spec @@ -0,0 +1,71 @@ +Name: xmlcopyeditor +Version: 1.1.0.6 +Release: 3%{?dist} +Summary: A fast, free, validating XML editor + +Group: Applications/Editors +License: GPLv2 +URL: http://xml-copy-editor.sourceforge.net/ +Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz +Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch +Patch1: xmlcopyeditor-1.1.0.6-nuke.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel +BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils +#Requires: + +%description +XML Copy Editor is a fast, free, validating XML editor. + +%prep +%setup -q +find src -type f -print0 | xargs -0 chmod a-x +tr -d '\r' < src/copying/gpl.txt > COPYING +chmod a-x AUTHORS COPYING NEWS +%patch0 -p 1 -b .defaultbrowser +%patch1 -p 1 -b .nuke + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +desktop-file-install --vendor=fedora --remove-category Application \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +sed -i -e "s/\(Icon=[^.]\+\).[^.]\+/\1/" $RPM_BUILD_ROOT%{_datadir}/applications/*%{name}.desktop +#rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/po + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +update-desktop-database &> /dev/null || : + +%postun +update-desktop-database &> /dev/null || : + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING NEWS +%{_bindir}/* +%{_datadir}/%{name} +%{_datadir}/applications/* +%{_datadir}/pixmaps/* + +%changelog +* Tue Jan 29 2008 Ignacio Vazquez-Abrams 1.1.0.6-3 +- Removed locale files for now +- Removed spurious license files +- Fixed debuginfo permissions +- Fixed desktop file handling + +* Mon Jan 28 2008 Ignacio Vazquez-Abrams 1.1.0.6-2 +- Changed search list of default browsers + +* Sun Jan 27 2008 Ignacio Vazquez-Abrams 1.1.0.6-1 +- Initial RPM release From 7d40fbec7f95aba7d4461b6cce6dc1c09983eeb9 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Tue, 29 Jan 2008 19:59:15 +0000 Subject: [PATCH 03/59] Initial import --- .cvsignore | 1 + sources | 1 + xmlcopyeditor-1.1.0.6-defaultbrowser.patch | 32 ++++++++++ xmlcopyeditor-1.1.0.6-nuke.patch | 58 ++++++++++++++++++ xmlcopyeditor.spec | 71 ++++++++++++++++++++++ 5 files changed, 163 insertions(+) create mode 100644 xmlcopyeditor-1.1.0.6-defaultbrowser.patch create mode 100644 xmlcopyeditor-1.1.0.6-nuke.patch create mode 100644 xmlcopyeditor.spec diff --git a/.cvsignore b/.cvsignore index e69de29..d73f97e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xmlcopyeditor-1.1.0.6.tar.gz diff --git a/sources b/sources index e69de29..4c473d5 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +29350234faca3ad978ff74dbbf7f3ef5 xmlcopyeditor-1.1.0.6.tar.gz diff --git a/xmlcopyeditor-1.1.0.6-defaultbrowser.patch b/xmlcopyeditor-1.1.0.6-defaultbrowser.patch new file mode 100644 index 0000000..3484897 --- /dev/null +++ b/xmlcopyeditor-1.1.0.6-defaultbrowser.patch @@ -0,0 +1,32 @@ +diff -up xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp.defaultbrowser xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp +--- xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp.defaultbrowser 2008-01-28 02:38:06.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp 2008-01-28 09:48:46.000000000 -0500 +@@ -1015,17 +1015,18 @@ MyFrame::~MyFrame() + wxString MyFrame::getLinuxBrowser() + { + wxString s; +- const int stringArrayLen = 9; ++ const int stringArrayLen = 10; + wxString stringArray[stringArrayLen]; +- stringArray[0] = _T ( "/usr/bin/firefox" ); +- stringArray[1] = _T ( "/usr/bin/mozilla" ); +- stringArray[2] = _T ( "/usr/bin/opera" ); +- stringArray[3] = _T ( "/usr/bin/dillo" ); +- stringArray[4] = _T ( "/opt/gnome/bin/epiphany" ); +- stringArray[5] = _T ( "/opt/gnome/bin/galeon" ); +- stringArray[6] = _T ( "/opt/kde/bin/konqueror" ); +- stringArray[7] = _T ( "/opt/mozilla/bin/firefox" ); +- stringArray[8] = wxEmptyString; // empty option is safe ++ stringArray[0] = _T ( "/usr/bin/xdg-open" ); ++ stringArray[1] = _T ( "/usr/bin/htmlview" ); ++ stringArray[2] = _T ( "/usr/bin/galeon" ); ++ stringArray[3] = _T ( "/usr/bin/epiphany" ); ++ stringArray[4] = _T ( "/usr/bin/firefox" ); ++ stringArray[5] = _T ( "/usr/bin/mozilla" ); ++ stringArray[6] = _T ( "/usr/bin/konqueror" ); ++ stringArray[7] = _T ( "/usr/bin/opera" ); ++ stringArray[8] = _T ( "/usr/bin/dillo" ); ++ stringArray[9] = wxEmptyString; // empty option is safe + + for ( int i = 0; i < stringArrayLen; i++ ) + { diff --git a/xmlcopyeditor-1.1.0.6-nuke.patch b/xmlcopyeditor-1.1.0.6-nuke.patch new file mode 100644 index 0000000..bc2a79c --- /dev/null +++ b/xmlcopyeditor-1.1.0.6-nuke.patch @@ -0,0 +1,58 @@ +diff -up xmlcopyeditor-1.1.0.6/src/Makefile.in.nuke xmlcopyeditor-1.1.0.6/src/Makefile.in +--- xmlcopyeditor-1.1.0.6/src/Makefile.in.nuke 2008-01-29 03:03:11.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/Makefile.in 2008-01-29 03:03:59.000000000 -0500 +@@ -241,24 +241,7 @@ nobase_xmlcopyeditor_DATA = png/*.png \ + rng/modules/*.rng \ + xpm/*.xpm \ + templates/*.* \ +- help/*.* help/html/*.* \ +- copying/*.txt copying/boost_shared_ptr/* \ +- copying/Expat/* copying/libxml2/* copying/libxslt/* \ +- copying/PCRE/* copying/Scintilla/* \ +- copying/scowl/* \ +- copying/wxStyledTextCtrl/* copying/ximian/* \ +- copying/wxStEditor/* \ +- copying/xmlcopyeditor/* \ +- copying/Aspell/* \ +- copying/Apache/LICENSE-2.0 \ +- copying/Apache/LICENSE-2_files/* \ +- po/sk/messages.mo \ +- po/sv/messages.mo \ +- po/fr/messages.mo \ +- po/de/messages.mo \ +- po/zh_CN/messages.mo \ +- po/zh_TW/messages.mo \ +- po/en_us/messages.po ++ help/*.* help/html/*.* + + pixmap_DATA = xmlcopyeditor.png + applications_DATA = xmlcopyeditor.desktop +diff -up xmlcopyeditor-1.1.0.6/src/Makefile.am.nuke xmlcopyeditor-1.1.0.6/src/Makefile.am +--- xmlcopyeditor-1.1.0.6/src/Makefile.am.nuke 2008-01-29 03:03:06.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/Makefile.am 2008-01-29 03:03:41.000000000 -0500 +@@ -50,25 +50,6 @@ nobase_xmlcopyeditor_DATA = png/*.png \ + templates/*.lzx \ + templates/*.xlf \ + help/*.* help/html/*.* \ +- copying/*.txt copying/boost_shared_ptr/* \ +- copying/Expat/* copying/libxml2/* copying/libxslt/* \ +- copying/PCRE/* copying/Scintilla/* \ +- copying/scowl/* \ +- copying/wxStyledTextCtrl/* copying/ximian/* \ +- copying/wxStEditor/* \ +- copying/xmlcopyeditor/* \ +- copying/Aspell/* \ +- copying/Apache/LICENSE-2.0 \ +- copying/Apache/LICENSE-2_files/* \ +- po/sk/messages.mo \ +- po/sv/messages.mo \ +- po/fr/messages.mo \ +- po/de/messages.mo \ +- po/zh_CN/messages.mo \ +- po/zh_TW/messages.mo \ +- po/uk_UA/messages.mo \ +- po/uk_UA/messages.mo \ +- po/en_us/messages.po \ + + pixmap_DATA = xmlcopyeditor.png + diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec new file mode 100644 index 0000000..cd0bd0d --- /dev/null +++ b/xmlcopyeditor.spec @@ -0,0 +1,71 @@ +Name: xmlcopyeditor +Version: 1.1.0.6 +Release: 3%{?dist} +Summary: A fast, free, validating XML editor + +Group: Applications/Editors +License: GPLv2 +URL: http://xml-copy-editor.sourceforge.net/ +Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz +Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch +Patch1: xmlcopyeditor-1.1.0.6-nuke.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel +BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils +#Requires: + +%description +XML Copy Editor is a fast, free, validating XML editor. + +%prep +%setup -q +find src -type f -print0 | xargs -0 chmod a-x +tr -d '\r' < src/copying/gpl.txt > COPYING +chmod a-x AUTHORS COPYING NEWS +%patch0 -p 1 -b .defaultbrowser +%patch1 -p 1 -b .nuke + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +desktop-file-install --vendor=fedora --remove-category Application \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +sed -i -e "s/\(Icon=[^.]\+\).[^.]\+/\1/" $RPM_BUILD_ROOT%{_datadir}/applications/*%{name}.desktop +#rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/po + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +update-desktop-database &> /dev/null || : + +%postun +update-desktop-database &> /dev/null || : + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING NEWS +%{_bindir}/* +%{_datadir}/%{name} +%{_datadir}/applications/* +%{_datadir}/pixmaps/* + +%changelog +* Tue Jan 29 2008 Ignacio Vazquez-Abrams 1.1.0.6-3 +- Removed locale files for now +- Removed spurious license files +- Fixed debuginfo permissions +- Fixed desktop file handling + +* Mon Jan 28 2008 Ignacio Vazquez-Abrams 1.1.0.6-2 +- Changed search list of default browsers + +* Sun Jan 27 2008 Ignacio Vazquez-Abrams 1.1.0.6-1 +- Initial RPM release From 6a3858a8689264ec3e529dd6fd308d270828a222 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Tue, 29 Jan 2008 20:06:35 +0000 Subject: [PATCH 04/59] Remove unused tag --- xmlcopyeditor.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index cd0bd0d..cdbc972 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils -#Requires: %description XML Copy Editor is a fast, free, validating XML editor. From c2277a315a8a7b31cf882cc9c3c51eb19ef1de64 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Tue, 29 Jan 2008 20:06:50 +0000 Subject: [PATCH 05/59] Remove unused tag --- xmlcopyeditor.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index cd0bd0d..cdbc972 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils -#Requires: %description XML Copy Editor is a fast, free, validating XML editor. From e37c25a7cda8590433aac987131614ee446422f7 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Thu, 14 Feb 2008 05:11:57 +0000 Subject: [PATCH 06/59] Fixed build under GCC 4.3 --- xmlcopyeditor-1.1.0.6-gcc43.patch | 264 ++++++++++++++++++++++++++++++ xmlcopyeditor.spec | 7 +- 2 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 xmlcopyeditor-1.1.0.6-gcc43.patch diff --git a/xmlcopyeditor-1.1.0.6-gcc43.patch b/xmlcopyeditor-1.1.0.6-gcc43.patch new file mode 100644 index 0000000..18f5f2f --- /dev/null +++ b/xmlcopyeditor-1.1.0.6-gcc43.patch @@ -0,0 +1,264 @@ +diff -up xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp +--- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp.gcc43 2008-02-13 23:11:04.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp 2008-02-13 23:11:44.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "xmlfilterreader.h" + + using namespace std; +diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp +--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp.gcc43 2008-02-13 22:50:22.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp 2008-02-13 22:51:01.000000000 -0500 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "xmlassociatexsl.h" + + XmlAssociateXsl::XmlAssociateXsl ( const std::string& path, size_t size ) : +diff -up xmlcopyeditor-1.1.0.6/src/housestylewriter.h.gcc43 xmlcopyeditor-1.1.0.6/src/housestylewriter.h +--- xmlcopyeditor-1.1.0.6/src/housestylewriter.h.gcc43 2008-02-13 23:46:54.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/housestylewriter.h 2008-02-13 23:47:07.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + #include "wrapregex.h" + #include "contexthandler.h" +diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h +--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h.gcc43 2008-02-13 22:35:15.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h 2008-02-13 22:35:36.000000000 -0500 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct AssociateXsdData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/xmlwordcount.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlwordcount.h +--- xmlcopyeditor-1.1.0.6/src/xmlwordcount.h.gcc43 2008-02-13 23:52:56.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlwordcount.h 2008-02-13 23:53:06.000000000 -0500 +@@ -21,6 +21,7 @@ + #define XML_WORD_COUNT_H + + #include ++#include + #include "wrapexpat.h" + + struct WordCountData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h +--- xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h.gcc43 2008-02-13 22:58:11.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h 2008-02-13 22:59:00.000000000 -0500 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct XmlShallowValidatorData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h +--- xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h.gcc43 2008-02-14 00:01:03.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h 2008-02-14 00:01:20.000000000 -0500 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include "wrapexpat.h" + + struct EncodingData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h +--- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h.gcc43 2008-02-13 23:28:10.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h 2008-02-13 23:28:34.000000000 -0500 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include "wrapexpat.h" + + struct SchemaLocatorData +diff -up xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h +--- xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h.gcc43 2008-02-13 22:58:11.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h 2008-02-13 22:58:33.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + #include "parserdata.h" + +diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h +--- xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h.gcc43 2008-02-13 22:26:41.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h 2008-02-13 22:26:58.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct DtdData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp +--- xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp.gcc43 2008-02-13 22:58:11.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp 2008-02-13 22:59:23.000000000 -0500 +@@ -22,6 +22,7 @@ + #include "xmlshallowvalidator.h" + #include "xmlencodinghandler.h" + #include ++#include + + // adapted from wxSTEdit (c) 2005 John Labenski, Otto Wyss + #define XMLCTRL_HASBIT(value, bit) (((value) & (bit)) != 0) +diff -up xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h +--- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h.gcc43 2008-02-13 23:11:04.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h 2008-02-13 23:11:35.000000000 -0500 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + using namespace std; +diff -up xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h +--- xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h.gcc43 2008-02-13 22:35:52.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h 2008-02-13 22:36:09.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct ParseSchemaNsData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h +--- xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h.gcc43 2008-02-13 23:34:17.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h 2008-02-13 23:34:32.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct UtfData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp +--- xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp.gcc43 2008-02-13 19:59:16.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp 2008-02-13 19:59:26.000000000 -0500 +@@ -19,6 +19,7 @@ + + #include "globalreplacedialog.h" + #include "wrapregex.h" ++#include + + BEGIN_EVENT_TABLE ( GlobalReplaceDialog, wxDialog ) + EVT_BUTTON ( wxID_OK, GlobalReplaceDialog::OnOk ) +diff -up xmlcopyeditor-1.1.0.6/src/xsllocator.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xsllocator.cpp +--- xmlcopyeditor-1.1.0.6/src/xsllocator.cpp.gcc43 2008-02-13 23:40:13.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xsllocator.cpp 2008-02-13 23:40:46.000000000 -0500 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "xsllocator.h" + + XslLocator::XslLocator() : d ( new XslLocatorData() ) +diff -up xmlcopyeditor-1.1.0.6/src/housestylereader.h.gcc43 xmlcopyeditor-1.1.0.6/src/housestylereader.h +--- xmlcopyeditor-1.1.0.6/src/housestylereader.h.gcc43 2008-02-13 22:13:55.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/housestylereader.h 2008-02-13 22:13:59.000000000 -0500 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + using namespace std; +diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h +--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h.gcc43 2008-02-13 22:49:52.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h 2008-02-13 22:50:09.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct XslData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp +--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp.gcc43 2008-02-13 22:43:24.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp 2008-02-13 22:43:42.000000000 -0500 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "xmlassociatexsd.h" + #include "xmlparseschemans.h" + #include "readfile.h" +diff -up xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp +--- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp.gcc43 2008-02-13 23:28:10.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp 2008-02-13 23:28:46.000000000 -0500 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "xmlschemalocator.h" + + XmlSchemaLocator::XmlSchemaLocator() : +diff -up xmlcopyeditor-1.1.0.6/src/stringset.h.gcc43 xmlcopyeditor-1.1.0.6/src/stringset.h +--- xmlcopyeditor-1.1.0.6/src/stringset.h.gcc43 2008-02-13 20:22:00.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/stringset.h 2008-02-13 20:22:18.000000000 -0500 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #ifdef __WXMSW__ + #include + #endif +diff -up xmlcopyeditor-1.1.0.6/src/wrapregex.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/wrapregex.cpp +--- xmlcopyeditor-1.1.0.6/src/wrapregex.cpp.gcc43 2008-02-13 22:20:55.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/wrapregex.cpp 2008-02-13 22:21:09.000000000 -0500 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "wrapregex.h" + #include "contexthandler.h" + +diff -up xmlcopyeditor-1.1.0.6/src/xsllocator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xsllocator.h +--- xmlcopyeditor-1.1.0.6/src/xsllocator.h.gcc43 2008-02-13 23:40:13.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xsllocator.h 2008-02-13 23:40:34.000000000 -0500 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include "wrapexpat.h" + + struct XslLocatorData : public ParserData +diff -up xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp +--- xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp.gcc43 2008-02-13 23:04:33.000000000 -0500 ++++ xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp 2008-02-13 23:04:53.000000000 -0500 +@@ -17,6 +17,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include + #include "xmlencodinghandler.h" + + bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 ) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index cdbc972..bcfaefd 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.1.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -9,6 +9,7 @@ URL: http://xml-copy-editor.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch Patch1: xmlcopyeditor-1.1.0.6-nuke.patch +Patch2: xmlcopyeditor-1.1.0.6-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel @@ -24,6 +25,7 @@ tr -d '\r' < src/copying/gpl.txt > COPYING chmod a-x AUTHORS COPYING NEWS %patch0 -p 1 -b .defaultbrowser %patch1 -p 1 -b .nuke +%patch2 -p 1 -b .gcc43 %build %configure @@ -57,6 +59,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Wed Feb 13 2008 Ignacio Vazquez-Abrams 1.1.0.6-4 +- Fixed build under GCC 4.3 + * Tue Jan 29 2008 Ignacio Vazquez-Abrams 1.1.0.6-3 - Removed locale files for now - Removed spurious license files From 1f6697a92668ecd769fa1c51cfea700d95ae2b17 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Mon, 23 Feb 2009 22:11:55 +0000 Subject: [PATCH 07/59] I'm working on getting a newer version in, but I'm hitting some build errors --- noautobuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 noautobuild diff --git a/noautobuild b/noautobuild new file mode 100644 index 0000000..617eb61 --- /dev/null +++ b/noautobuild @@ -0,0 +1 @@ +I'm working on getting a newer version in, but I'm hitting some build errors. From fdf133ed8b681664d2a60e0b0a1fa860888a82a5 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Wed, 25 Feb 2009 09:10:08 +0000 Subject: [PATCH 08/59] Upstream update (http://sourceforge.net/news/?group_id=141776) --- .cvsignore | 2 +- noautobuild | 2 +- sources | 2 +- xmlcopyeditor.spec | 11 +++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index d73f97e..d519270 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmlcopyeditor-1.1.0.6.tar.gz +xmlcopyeditor-1.2.0.2.tar.gz diff --git a/noautobuild b/noautobuild index 617eb61..22f99cd 100644 --- a/noautobuild +++ b/noautobuild @@ -1 +1 @@ -I'm working on getting a newer version in, but I'm hitting some build errors. +Does not currently build (https://bugzilla.redhat.com/show_bug.cgi?id=487073) diff --git a/sources b/sources index 4c473d5..41e3b60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29350234faca3ad978ff74dbbf7f3ef5 xmlcopyeditor-1.1.0.6.tar.gz +93366ece597873fb58bb46eb307dd8f5 xmlcopyeditor-1.2.0.2.tar.gz diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index bcfaefd..e879cbf 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor -Version: 1.1.0.6 -Release: 4%{?dist} +Version: 1.2.0.2 +Release: 1%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -8,8 +8,6 @@ License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch -Patch1: xmlcopyeditor-1.1.0.6-nuke.patch -Patch2: xmlcopyeditor-1.1.0.6-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel @@ -24,8 +22,6 @@ find src -type f -print0 | xargs -0 chmod a-x tr -d '\r' < src/copying/gpl.txt > COPYING chmod a-x AUTHORS COPYING NEWS %patch0 -p 1 -b .defaultbrowser -%patch1 -p 1 -b .nuke -%patch2 -p 1 -b .gcc43 %build %configure @@ -59,6 +55,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Thu Feb 05 2009 Ignacio Vazquez-Abrams 1.2.0.2-1 +- Upstream update (http://sourceforge.net/news/?group_id=141776) + * Wed Feb 13 2008 Ignacio Vazquez-Abrams 1.1.0.6-4 - Fixed build under GCC 4.3 From 11567c01fa1dbf68eccb418db7eedce8a95a61b1 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Sat, 12 Sep 2009 19:24:27 +0000 Subject: [PATCH 09/59] Resolves: rhbz#508867 rhbz#511552 FTBFS --- noautobuild | 1 - xmlcopyeditor-1.1.0.6-gcc43.patch | 264 ------------------------------ xmlcopyeditor-1.1.0.6-nuke.patch | 58 ------- xmlcopyeditor-1.2.0.2.gcc44.patch | 133 +++++++++++++++ xmlcopyeditor.spec | 7 +- 5 files changed, 139 insertions(+), 324 deletions(-) delete mode 100644 noautobuild delete mode 100644 xmlcopyeditor-1.1.0.6-gcc43.patch delete mode 100644 xmlcopyeditor-1.1.0.6-nuke.patch create mode 100644 xmlcopyeditor-1.2.0.2.gcc44.patch diff --git a/noautobuild b/noautobuild deleted file mode 100644 index 22f99cd..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -Does not currently build (https://bugzilla.redhat.com/show_bug.cgi?id=487073) diff --git a/xmlcopyeditor-1.1.0.6-gcc43.patch b/xmlcopyeditor-1.1.0.6-gcc43.patch deleted file mode 100644 index 18f5f2f..0000000 --- a/xmlcopyeditor-1.1.0.6-gcc43.patch +++ /dev/null @@ -1,264 +0,0 @@ -diff -up xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp.gcc43 2008-02-13 23:11:04.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp 2008-02-13 23:11:44.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "xmlfilterreader.h" - - using namespace std; -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp.gcc43 2008-02-13 22:50:22.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp 2008-02-13 22:51:01.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "xmlassociatexsl.h" - - XmlAssociateXsl::XmlAssociateXsl ( const std::string& path, size_t size ) : -diff -up xmlcopyeditor-1.1.0.6/src/housestylewriter.h.gcc43 xmlcopyeditor-1.1.0.6/src/housestylewriter.h ---- xmlcopyeditor-1.1.0.6/src/housestylewriter.h.gcc43 2008-02-13 23:46:54.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/housestylewriter.h 2008-02-13 23:47:07.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - #include "wrapregex.h" - #include "contexthandler.h" -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h ---- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h.gcc43 2008-02-13 22:35:15.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h 2008-02-13 22:35:36.000000000 -0500 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct AssociateXsdData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlwordcount.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlwordcount.h ---- xmlcopyeditor-1.1.0.6/src/xmlwordcount.h.gcc43 2008-02-13 23:52:56.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlwordcount.h 2008-02-13 23:53:06.000000000 -0500 -@@ -21,6 +21,7 @@ - #define XML_WORD_COUNT_H - - #include -+#include - #include "wrapexpat.h" - - struct WordCountData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h ---- xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h.gcc43 2008-02-13 22:58:11.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h 2008-02-13 22:59:00.000000000 -0500 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct XmlShallowValidatorData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h ---- xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h.gcc43 2008-02-14 00:01:03.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h 2008-02-14 00:01:20.000000000 -0500 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "wrapexpat.h" - - struct EncodingData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h ---- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h.gcc43 2008-02-13 23:28:10.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h 2008-02-13 23:28:34.000000000 -0500 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "wrapexpat.h" - - struct SchemaLocatorData -diff -up xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h ---- xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h.gcc43 2008-02-13 22:58:11.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h 2008-02-13 22:58:33.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - #include "parserdata.h" - -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h ---- xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h.gcc43 2008-02-13 22:26:41.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h 2008-02-13 22:26:58.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct DtdData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp.gcc43 2008-02-13 22:58:11.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlctrl.cpp 2008-02-13 22:59:23.000000000 -0500 -@@ -22,6 +22,7 @@ - #include "xmlshallowvalidator.h" - #include "xmlencodinghandler.h" - #include -+#include - - // adapted from wxSTEdit (c) 2005 John Labenski, Otto Wyss - #define XMLCTRL_HASBIT(value, bit) (((value) & (bit)) != 0) -diff -up xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h ---- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h.gcc43 2008-02-13 23:11:04.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h 2008-02-13 23:11:35.000000000 -0500 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - using namespace std; -diff -up xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h ---- xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h.gcc43 2008-02-13 22:35:52.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h 2008-02-13 22:36:09.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct ParseSchemaNsData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h ---- xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h.gcc43 2008-02-13 23:34:17.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h 2008-02-13 23:34:32.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct UtfData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp ---- xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp.gcc43 2008-02-13 19:59:16.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp 2008-02-13 19:59:26.000000000 -0500 -@@ -19,6 +19,7 @@ - - #include "globalreplacedialog.h" - #include "wrapregex.h" -+#include - - BEGIN_EVENT_TABLE ( GlobalReplaceDialog, wxDialog ) - EVT_BUTTON ( wxID_OK, GlobalReplaceDialog::OnOk ) -diff -up xmlcopyeditor-1.1.0.6/src/xsllocator.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xsllocator.cpp ---- xmlcopyeditor-1.1.0.6/src/xsllocator.cpp.gcc43 2008-02-13 23:40:13.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xsllocator.cpp 2008-02-13 23:40:46.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "xsllocator.h" - - XslLocator::XslLocator() : d ( new XslLocatorData() ) -diff -up xmlcopyeditor-1.1.0.6/src/housestylereader.h.gcc43 xmlcopyeditor-1.1.0.6/src/housestylereader.h ---- xmlcopyeditor-1.1.0.6/src/housestylereader.h.gcc43 2008-02-13 22:13:55.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/housestylereader.h 2008-02-13 22:13:59.000000000 -0500 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - using namespace std; -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h ---- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h.gcc43 2008-02-13 22:49:52.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h 2008-02-13 22:50:09.000000000 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct XslData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp.gcc43 2008-02-13 22:43:24.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp 2008-02-13 22:43:42.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "xmlassociatexsd.h" - #include "xmlparseschemans.h" - #include "readfile.h" -diff -up xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp.gcc43 2008-02-13 23:28:10.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp 2008-02-13 23:28:46.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "xmlschemalocator.h" - - XmlSchemaLocator::XmlSchemaLocator() : -diff -up xmlcopyeditor-1.1.0.6/src/stringset.h.gcc43 xmlcopyeditor-1.1.0.6/src/stringset.h ---- xmlcopyeditor-1.1.0.6/src/stringset.h.gcc43 2008-02-13 20:22:00.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/stringset.h 2008-02-13 20:22:18.000000000 -0500 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #ifdef __WXMSW__ - #include - #endif -diff -up xmlcopyeditor-1.1.0.6/src/wrapregex.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/wrapregex.cpp ---- xmlcopyeditor-1.1.0.6/src/wrapregex.cpp.gcc43 2008-02-13 22:20:55.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/wrapregex.cpp 2008-02-13 22:21:09.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "wrapregex.h" - #include "contexthandler.h" - -diff -up xmlcopyeditor-1.1.0.6/src/xsllocator.h.gcc43 xmlcopyeditor-1.1.0.6/src/xsllocator.h ---- xmlcopyeditor-1.1.0.6/src/xsllocator.h.gcc43 2008-02-13 23:40:13.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xsllocator.h 2008-02-13 23:40:34.000000000 -0500 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "wrapexpat.h" - - struct XslLocatorData : public ParserData -diff -up xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp.gcc43 xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp.gcc43 2008-02-13 23:04:33.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp 2008-02-13 23:04:53.000000000 -0500 -@@ -17,6 +17,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include - #include "xmlencodinghandler.h" - - bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 ) diff --git a/xmlcopyeditor-1.1.0.6-nuke.patch b/xmlcopyeditor-1.1.0.6-nuke.patch deleted file mode 100644 index bc2a79c..0000000 --- a/xmlcopyeditor-1.1.0.6-nuke.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -up xmlcopyeditor-1.1.0.6/src/Makefile.in.nuke xmlcopyeditor-1.1.0.6/src/Makefile.in ---- xmlcopyeditor-1.1.0.6/src/Makefile.in.nuke 2008-01-29 03:03:11.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/Makefile.in 2008-01-29 03:03:59.000000000 -0500 -@@ -241,24 +241,7 @@ nobase_xmlcopyeditor_DATA = png/*.png \ - rng/modules/*.rng \ - xpm/*.xpm \ - templates/*.* \ -- help/*.* help/html/*.* \ -- copying/*.txt copying/boost_shared_ptr/* \ -- copying/Expat/* copying/libxml2/* copying/libxslt/* \ -- copying/PCRE/* copying/Scintilla/* \ -- copying/scowl/* \ -- copying/wxStyledTextCtrl/* copying/ximian/* \ -- copying/wxStEditor/* \ -- copying/xmlcopyeditor/* \ -- copying/Aspell/* \ -- copying/Apache/LICENSE-2.0 \ -- copying/Apache/LICENSE-2_files/* \ -- po/sk/messages.mo \ -- po/sv/messages.mo \ -- po/fr/messages.mo \ -- po/de/messages.mo \ -- po/zh_CN/messages.mo \ -- po/zh_TW/messages.mo \ -- po/en_us/messages.po -+ help/*.* help/html/*.* - - pixmap_DATA = xmlcopyeditor.png - applications_DATA = xmlcopyeditor.desktop -diff -up xmlcopyeditor-1.1.0.6/src/Makefile.am.nuke xmlcopyeditor-1.1.0.6/src/Makefile.am ---- xmlcopyeditor-1.1.0.6/src/Makefile.am.nuke 2008-01-29 03:03:06.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/Makefile.am 2008-01-29 03:03:41.000000000 -0500 -@@ -50,25 +50,6 @@ nobase_xmlcopyeditor_DATA = png/*.png \ - templates/*.lzx \ - templates/*.xlf \ - help/*.* help/html/*.* \ -- copying/*.txt copying/boost_shared_ptr/* \ -- copying/Expat/* copying/libxml2/* copying/libxslt/* \ -- copying/PCRE/* copying/Scintilla/* \ -- copying/scowl/* \ -- copying/wxStyledTextCtrl/* copying/ximian/* \ -- copying/wxStEditor/* \ -- copying/xmlcopyeditor/* \ -- copying/Aspell/* \ -- copying/Apache/LICENSE-2.0 \ -- copying/Apache/LICENSE-2_files/* \ -- po/sk/messages.mo \ -- po/sv/messages.mo \ -- po/fr/messages.mo \ -- po/de/messages.mo \ -- po/zh_CN/messages.mo \ -- po/zh_TW/messages.mo \ -- po/uk_UA/messages.mo \ -- po/uk_UA/messages.mo \ -- po/en_us/messages.po \ - - pixmap_DATA = xmlcopyeditor.png - diff --git a/xmlcopyeditor-1.2.0.2.gcc44.patch b/xmlcopyeditor-1.2.0.2.gcc44.patch new file mode 100644 index 0000000..efc5e7d --- /dev/null +++ b/xmlcopyeditor-1.2.0.2.gcc44.patch @@ -0,0 +1,133 @@ +diff -ru xmlcopyeditor-1.2.0.2.orig/src/replace.cpp xmlcopyeditor-1.2.0.2/src/replace.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/replace.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/replace.cpp 2009-06-30 10:43:13.000000000 +0100 +@@ -18,6 +18,7 @@ + */ + + #include ++#include + #include "replace.h" + + int Replace::run ( +diff -ru xmlcopyeditor-1.2.0.2.orig/src/stringset.h xmlcopyeditor-1.2.0.2/src/stringset.h +--- xmlcopyeditor-1.2.0.2.orig/src/stringset.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/stringset.h 2009-06-30 10:40:40.000000000 +0100 +@@ -28,6 +28,7 @@ + #ifdef __WXMSW__ + #include + #endif ++#include + + template + class StringSetNode +diff -ru xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp 2009-06-30 11:12:37.000000000 +0100 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include "wrapaspell.h" + #include "aspell.h" + #include "casehandler.h" +diff -ru xmlcopyeditor-1.2.0.2.orig/src/wraplibxml.cpp xmlcopyeditor-1.2.0.2/src/wraplibxml.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/wraplibxml.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/wraplibxml.cpp 2009-06-30 11:23:19.000000000 +0100 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include "wraplibxml.h" + #include + #include + #include ++#include "wraplibxml.h" + + WrapLibxml::WrapLibxml ( bool netAccessParameter, const std::string& catalogPathParameter ) + : netAccess ( netAccessParameter ), catalogPath ( catalogPathParameter ) +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h +--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h 2009-06-30 11:04:26.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct DtdData : public ParserData +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h +--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h 2009-06-30 11:05:29.000000000 +0100 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct AssociateXsdData : public ParserData +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h +--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h 2009-06-30 11:05:55.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct XslData : public ParserData +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp 2009-06-30 11:23:56.000000000 +0100 +@@ -31,7 +31,6 @@ + #include "catalogresolver.h" + + // Xerces-C req'd for Schema parsing +-#define XERCES_TMPLSINC + + #include + #include +@@ -441,7 +440,7 @@ + } + + SchemaGrammar* grammar = ( SchemaGrammar* ) rootGrammar; +- RefHash3KeysIdPoolEnumerator elemEnum = grammar->getElemEnumerator(); ++ RefHash3KeysIdPoolEnumerator elemEnum (grammar->getElemEnumerator()); + + if ( !elemEnum.hasMoreElements() ) + { +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h +--- xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h 2009-06-30 11:08:20.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "wrapexpat.h" + + struct UtfData : public ParserData +diff -ru xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp xmlcopyeditor-1.2.0.2/src/xsllocator.cpp +--- xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp 2009-06-30 10:38:57.000000000 +0100 ++++ xmlcopyeditor-1.2.0.2/src/xsllocator.cpp 2009-06-30 11:11:23.000000000 +0100 +@@ -46,7 +46,7 @@ + return; + + char *value, *iterator; +- value = strstr ( ( const char * ) data, "href=" ); ++ value = strstr ( ( char * ) data, "href=" ); + if ( !value || strlen ( value ) < 7 ) + return; + value += 6; +@@ -55,7 +55,7 @@ + { + if ( *iterator == '"' || *iterator == '\'' ) + { +- *iterator = '\0'; ++ *iterator = '\0'; //bustage, modifying const *data + break; + } + } diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index e879cbf..a8240e8 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -8,6 +8,7 @@ License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch +Patch1: xmlcopyeditor-1.2.0.2.gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel @@ -22,6 +23,7 @@ find src -type f -print0 | xargs -0 chmod a-x tr -d '\r' < src/copying/gpl.txt > COPYING chmod a-x AUTHORS COPYING NEWS %patch0 -p 1 -b .defaultbrowser +%patch1 -p 1 -b .gcc44 %build %configure @@ -55,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Sat Sep 12 2009 Caolán McNamara 1.2.0.2-2 +- Resolves: rhbz#508867 rhbz#511552 FTBFS + * Thu Feb 05 2009 Ignacio Vazquez-Abrams 1.2.0.2-1 - Upstream update (http://sourceforge.net/news/?group_id=141776) From 2856b217a2c7e1b7ea7c960ef50eb0ed084204ad Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:00 +0000 Subject: [PATCH 10/59] 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 e275598..485d466 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xmlcopyeditor -# $Id$ +# $Id: Makefile,v 1.1 2008/01/29 17:52:21 kevin Exp $ NAME := xmlcopyeditor 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 cb41019674c97d1b18e99b5464f81c0b30d2c4cf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:12 +0000 Subject: [PATCH 11/59] 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 e275598..485d466 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xmlcopyeditor -# $Id$ +# $Id: Makefile,v 1.1 2008/01/29 17:52:21 kevin Exp $ NAME := xmlcopyeditor 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 84b766380d02bdb1c3575973083087650ca166af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 14 Jul 2010 12:53:51 +0000 Subject: [PATCH 12/59] - rebuilt against wxGTK-2.8.11-2 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index a8240e8..8ead318 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -57,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Wed Jul 14 2010 Dan Horák - 1.2.0.2-3 +- rebuilt against wxGTK-2.8.11-2 + * Sat Sep 12 2009 Caolán McNamara 1.2.0.2-2 - Resolves: rhbz#508867 rhbz#511552 FTBFS From 57f546c43f7a02c167735bb010e088aa879f25cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:55:58 +0000 Subject: [PATCH 13/59] 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 485d466..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlcopyeditor -# $Id: Makefile,v 1.1 2008/01/29 17:52:21 kevin Exp $ -NAME := xmlcopyeditor -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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7 From dea4d37a5293a5a7e249a48b4016206d28fca1da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:56:01 +0000 Subject: [PATCH 14/59] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 485d466..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlcopyeditor -# $Id: Makefile,v 1.1 2008/01/29 17:52:21 kevin Exp $ -NAME := xmlcopyeditor -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) From e9848fb7a0879044c277ec5d717f90509f4760ae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:29:10 -0600 Subject: [PATCH 15/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 8ead318..108775f 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -57,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jul 14 2010 Dan Horák - 1.2.0.2-3 - rebuilt against wxGTK-2.8.11-2 From d261db10a95dc975f2f7f3d9e3d164df490334c3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 10 Mar 2011 13:21:01 +0200 Subject: [PATCH 16/59] Rebuilt with xerces-c 3.1 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 108775f..bf112c4 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -57,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Thu Mar 10 2011 Kalev Lember - 1.2.0.2-5 +- Rebuilt with xerces-c 3.1 + * Mon Feb 07 2011 Fedora Release Engineering - 1.2.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 124b5a9efd681f58225bb066345731e94603dbd4 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Fri, 20 May 2011 22:56:22 -0400 Subject: [PATCH 17/59] Upstream update --- .gitignore | 1 + sources | 2 +- ...c44.patch => xmlcopyeditor-1.2.0.4-gcc44.patch | 15 --------------- xmlcopyeditor.spec | 9 ++++++--- 4 files changed, 8 insertions(+), 19 deletions(-) rename xmlcopyeditor-1.2.0.2.gcc44.patch => xmlcopyeditor-1.2.0.4-gcc44.patch (86%) diff --git a/.gitignore b/.gitignore index d519270..1397048 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xmlcopyeditor-1.2.0.2.tar.gz +/xmlcopyeditor-1.2.0.4.tar.gz diff --git a/sources b/sources index 41e3b60..724ce27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93366ece597873fb58bb46eb307dd8f5 xmlcopyeditor-1.2.0.2.tar.gz +0b85649a4ef6af817b1c4089237b2a57 xmlcopyeditor-1.2.0.4.tar.gz diff --git a/xmlcopyeditor-1.2.0.2.gcc44.patch b/xmlcopyeditor-1.2.0.4-gcc44.patch similarity index 86% rename from xmlcopyeditor-1.2.0.2.gcc44.patch rename to xmlcopyeditor-1.2.0.4-gcc44.patch index efc5e7d..7adb6aa 100644 --- a/xmlcopyeditor-1.2.0.2.gcc44.patch +++ b/xmlcopyeditor-1.2.0.4-gcc44.patch @@ -31,21 +31,6 @@ diff -ru xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp xmlcopyeditor-1.2.0.2/src #include "wrapaspell.h" #include "aspell.h" #include "casehandler.h" -diff -ru xmlcopyeditor-1.2.0.2.orig/src/wraplibxml.cpp xmlcopyeditor-1.2.0.2/src/wraplibxml.cpp ---- xmlcopyeditor-1.2.0.2.orig/src/wraplibxml.cpp 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/wraplibxml.cpp 2009-06-30 11:23:19.000000000 +0100 -@@ -17,10 +17,10 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#include "wraplibxml.h" - #include - #include - #include -+#include "wraplibxml.h" - - WrapLibxml::WrapLibxml ( bool netAccessParameter, const std::string& catalogPathParameter ) - : netAccess ( netAccessParameter ), catalogPath ( catalogPathParameter ) diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h --- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h 2009-06-30 10:38:57.000000000 +0100 +++ xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h 2009-06-30 11:04:26.000000000 +0100 diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index bf112c4..2e669f4 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor -Version: 1.2.0.2 -Release: 5%{?dist} +Version: 1.2.0.4 +Release: 1%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -8,7 +8,7 @@ License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch -Patch1: xmlcopyeditor-1.2.0.2.gcc44.patch +Patch1: xmlcopyeditor-1.2.0.4-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel @@ -57,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Fri May 20 2011 Ignacio Vazquez-Abrams 1.2.0.4-1 +- Upstream update + * Thu Mar 10 2011 Kalev Lember - 1.2.0.2-5 - Rebuilt with xerces-c 3.1 From b43c6764930ab6e820ded00ed4d363900adb4f88 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:03:13 -0600 Subject: [PATCH 18/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 2e669f4..73168a0 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -57,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri May 20 2011 Ignacio Vazquez-Abrams 1.2.0.4-1 - Upstream update From 7cf3b7617b53cc4c091d0bf11c67f44930ccf74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 10 Feb 2012 13:06:03 +0100 Subject: [PATCH 19/59] Rebuild against PCRE 8.30 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 73168a0..88cd0d5 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -57,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Fri Feb 10 2012 Petr Pisar - 1.2.0.4-3 +- Rebuild against PCRE 8.30 + * Sat Jan 14 2012 Fedora Release Engineering - 1.2.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 3b4be6543dc5fb22af7a0be752096b8defaa08c7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:50:37 -0500 Subject: [PATCH 20/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 88cd0d5..f151a3b 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -57,6 +57,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.2.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Feb 10 2012 Petr Pisar - 1.2.0.4-3 - Rebuild against PCRE 8.30 From 8f8d1d6e35babff1ff923334875ee5a889666614 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sun, 10 Feb 2013 11:38:07 +0530 Subject: [PATCH 21/59] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 - Cleanup spec as per recently changed packaging guidelines --- xmlcopyeditor.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index f151a3b..59d7485 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -9,7 +9,6 @@ URL: http://xml-copy-editor.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch Patch1: xmlcopyeditor-1.2.0.4-gcc44.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils @@ -30,18 +29,14 @@ chmod a-x AUTHORS COPYING NEWS make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor=fedora --remove-category Application \ +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +desktop-file-install --remove-category Application \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop sed -i -e "s/\(Icon=[^.]\+\).[^.]\+/\1/" $RPM_BUILD_ROOT%{_datadir}/applications/*%{name}.desktop #rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/po -%clean -rm -rf $RPM_BUILD_ROOT - %post update-desktop-database &> /dev/null || : @@ -49,7 +44,6 @@ update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || : %files -%defattr(-,root,root,-) %doc AUTHORS COPYING NEWS %{_bindir}/* %{_datadir}/%{name} @@ -57,6 +51,10 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Sun Feb 10 2013 Parag Nemade - 1.2.0.4-5 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 +- Cleanup spec as per recently changed packaging guidelines + * Sun Jul 22 2012 Fedora Release Engineering - 1.2.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 1e64633f0eacbdd4987aaafcf5a403463c811a6b Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sun, 10 Feb 2013 22:54:26 +0530 Subject: [PATCH 22/59] Add fix in spec file only for failed compilation --- xmlcopyeditor.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 59d7485..e68860c 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -24,6 +24,11 @@ chmod a-x AUTHORS COPYING NEWS %patch0 -p 1 -b .defaultbrowser %patch1 -p 1 -b .gcc44 +# let's fix the compilation error +# housestyle.h:71:19: error: stray ',' at end of member declaration +sed -i 's|error,|error|g' src/housestyle.h +sed -i 's|aspellDataPath,|,aspellDataPath,|g' src/housestyle.h + %build %configure make %{?_smp_mflags} @@ -51,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Sun Feb 10 2013 Parag Nemade - 1.2.0.4-6 +- Add fix in spec file only for failed compilation + * Sun Feb 10 2013 Parag Nemade - 1.2.0.4-5 - Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 - Cleanup spec as per recently changed packaging guidelines From 5485c9f54b92bc387d5bd683c24823308a873bea Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 30 Jul 2013 14:56:31 +0200 Subject: [PATCH 23/59] Rebuild for boost 1.54.0 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index e68860c..39d615d 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Tue Jul 30 2013 Petr Machata - 1.2.0.4-7 +- Rebuild for boost 1.54.0 + * Sun Feb 10 2013 Parag Nemade - 1.2.0.4-6 - Add fix in spec file only for failed compilation From 446518650245edf2ef899a1b78b84a48a70912d6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:29:28 -0500 Subject: [PATCH 24/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 39d615d..d6e4e2a 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 30 2013 Petr Machata - 1.2.0.4-7 - Rebuild for boost 1.54.0 From eb67a79b5b020de7af66d0a7cbda198a679cc769 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 May 2014 03:24:06 +0200 Subject: [PATCH 25/59] Rebuild for boost 1.55.0 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index d6e4e2a..c044c53 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Fri May 23 2014 Petr Machata - 1.2.0.4-9 +- Rebuild for boost 1.55.0 + * Sun Aug 04 2013 Fedora Release Engineering - 1.2.0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 24d405bbd26bf51b31ec7c3798352109c4c10e3c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:05:59 -0500 Subject: [PATCH 26/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index c044c53..5bba357 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.2.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 Petr Machata - 1.2.0.4-9 - Rebuild for boost 1.55.0 From 1be32ef845fa318d2b40ef28cd8eb6cdddbf799c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:14:01 +0000 Subject: [PATCH 27/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 5bba357..868faa5 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.0.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.2.0.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 42246ad6030a36c0f0e0a6d91bf57d4123effc75 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 Jan 2015 02:31:19 +0100 Subject: [PATCH 28/59] Rebuild for boost 1.57.0 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 868faa5..2699f09 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Tue Jan 27 2015 Petr Machata - 1.2.0.4-12 +- Rebuild for boost 1.57.0 + * Mon Aug 18 2014 Fedora Release Engineering - 1.2.0.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From effd767f18b7b831966a22f43a6fb85be98f77e2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:08:36 +0000 Subject: [PATCH 29/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 2699f09..5a776db 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.0.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Jan 27 2015 Petr Machata - 1.2.0.4-12 - Rebuild for boost 1.57.0 From b7ea6b46ec9bd52a00ea7b897a6e2f21b158a9d2 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 22:38:23 +0200 Subject: [PATCH 30/59] rebuild for Boost 1.58 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 5a776db..c2eb4e7 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Wed Jul 22 2015 David Tardon - 1.2.0.4-14 +- rebuild for Boost 1.58 + * Fri Jun 19 2015 Fedora Release Engineering - 1.2.0.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 794a8d1103022197ab49f85a2f24950262991511 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 13:36:38 -0500 Subject: [PATCH 31/59] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index c2eb4e7..1abf1ad 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.0.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/pixmaps/* %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 1.2.0.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 1.2.0.4-14 - rebuild for Boost 1.58 From 52ec537ab5081f24f5f556296483852231c0e31e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 30 Jul 2015 18:10:00 -0700 Subject: [PATCH 32/59] update to newest upstream --- .gitignore | 1 + sources | 2 +- xmlcopyeditor-1.1.0.6-defaultbrowser.patch | 32 ------ xmlcopyeditor-1.2.0.4-gcc44.patch | 118 --------------------- xmlcopyeditor.spec | 31 +++--- 5 files changed, 17 insertions(+), 167 deletions(-) delete mode 100644 xmlcopyeditor-1.1.0.6-defaultbrowser.patch delete mode 100644 xmlcopyeditor-1.2.0.4-gcc44.patch diff --git a/.gitignore b/.gitignore index 1397048..b93f9b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xmlcopyeditor-1.2.0.2.tar.gz /xmlcopyeditor-1.2.0.4.tar.gz +/xmlcopyeditor-1.2.1.3.tar.gz diff --git a/sources b/sources index 724ce27..f55bb16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b85649a4ef6af817b1c4089237b2a57 xmlcopyeditor-1.2.0.4.tar.gz +b8ec66bbf41d6dd10ffe704e5b5f4b5e xmlcopyeditor-1.2.1.3.tar.gz diff --git a/xmlcopyeditor-1.1.0.6-defaultbrowser.patch b/xmlcopyeditor-1.1.0.6-defaultbrowser.patch deleted file mode 100644 index 3484897..0000000 --- a/xmlcopyeditor-1.1.0.6-defaultbrowser.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp.defaultbrowser xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp ---- xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp.defaultbrowser 2008-01-28 02:38:06.000000000 -0500 -+++ xmlcopyeditor-1.1.0.6/src/xmlcopyeditor.cpp 2008-01-28 09:48:46.000000000 -0500 -@@ -1015,17 +1015,18 @@ MyFrame::~MyFrame() - wxString MyFrame::getLinuxBrowser() - { - wxString s; -- const int stringArrayLen = 9; -+ const int stringArrayLen = 10; - wxString stringArray[stringArrayLen]; -- stringArray[0] = _T ( "/usr/bin/firefox" ); -- stringArray[1] = _T ( "/usr/bin/mozilla" ); -- stringArray[2] = _T ( "/usr/bin/opera" ); -- stringArray[3] = _T ( "/usr/bin/dillo" ); -- stringArray[4] = _T ( "/opt/gnome/bin/epiphany" ); -- stringArray[5] = _T ( "/opt/gnome/bin/galeon" ); -- stringArray[6] = _T ( "/opt/kde/bin/konqueror" ); -- stringArray[7] = _T ( "/opt/mozilla/bin/firefox" ); -- stringArray[8] = wxEmptyString; // empty option is safe -+ stringArray[0] = _T ( "/usr/bin/xdg-open" ); -+ stringArray[1] = _T ( "/usr/bin/htmlview" ); -+ stringArray[2] = _T ( "/usr/bin/galeon" ); -+ stringArray[3] = _T ( "/usr/bin/epiphany" ); -+ stringArray[4] = _T ( "/usr/bin/firefox" ); -+ stringArray[5] = _T ( "/usr/bin/mozilla" ); -+ stringArray[6] = _T ( "/usr/bin/konqueror" ); -+ stringArray[7] = _T ( "/usr/bin/opera" ); -+ stringArray[8] = _T ( "/usr/bin/dillo" ); -+ stringArray[9] = wxEmptyString; // empty option is safe - - for ( int i = 0; i < stringArrayLen; i++ ) - { diff --git a/xmlcopyeditor-1.2.0.4-gcc44.patch b/xmlcopyeditor-1.2.0.4-gcc44.patch deleted file mode 100644 index 7adb6aa..0000000 --- a/xmlcopyeditor-1.2.0.4-gcc44.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -ru xmlcopyeditor-1.2.0.2.orig/src/replace.cpp xmlcopyeditor-1.2.0.2/src/replace.cpp ---- xmlcopyeditor-1.2.0.2.orig/src/replace.cpp 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/replace.cpp 2009-06-30 10:43:13.000000000 +0100 -@@ -18,6 +18,7 @@ - */ - - #include -+#include - #include "replace.h" - - int Replace::run ( -diff -ru xmlcopyeditor-1.2.0.2.orig/src/stringset.h xmlcopyeditor-1.2.0.2/src/stringset.h ---- xmlcopyeditor-1.2.0.2.orig/src/stringset.h 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/stringset.h 2009-06-30 10:40:40.000000000 +0100 -@@ -28,6 +28,7 @@ - #ifdef __WXMSW__ - #include - #endif -+#include - - template - class StringSetNode -diff -ru xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp ---- xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp 2009-06-30 11:12:37.000000000 +0100 -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include "wrapaspell.h" - #include "aspell.h" - #include "casehandler.h" -diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h ---- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h 2009-06-30 11:04:26.000000000 +0100 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct DtdData : public ParserData -diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h ---- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h 2009-06-30 11:05:29.000000000 +0100 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct AssociateXsdData : public ParserData -diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h ---- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h 2009-06-30 11:05:55.000000000 +0100 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct XslData : public ParserData -diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp ---- xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp 2009-06-30 11:23:56.000000000 +0100 -@@ -31,7 +31,6 @@ - #include "catalogresolver.h" - - // Xerces-C req'd for Schema parsing --#define XERCES_TMPLSINC - - #include - #include -@@ -441,7 +440,7 @@ - } - - SchemaGrammar* grammar = ( SchemaGrammar* ) rootGrammar; -- RefHash3KeysIdPoolEnumerator elemEnum = grammar->getElemEnumerator(); -+ RefHash3KeysIdPoolEnumerator elemEnum (grammar->getElemEnumerator()); - - if ( !elemEnum.hasMoreElements() ) - { -diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h ---- xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h 2009-06-30 11:08:20.000000000 +0100 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include "wrapexpat.h" - - struct UtfData : public ParserData -diff -ru xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp xmlcopyeditor-1.2.0.2/src/xsllocator.cpp ---- xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp 2009-06-30 10:38:57.000000000 +0100 -+++ xmlcopyeditor-1.2.0.2/src/xsllocator.cpp 2009-06-30 11:11:23.000000000 +0100 -@@ -46,7 +46,7 @@ - return; - - char *value, *iterator; -- value = strstr ( ( const char * ) data, "href=" ); -+ value = strstr ( ( char * ) data, "href=" ); - if ( !value || strlen ( value ) < 7 ) - return; - value += 6; -@@ -55,7 +55,7 @@ - { - if ( *iterator == '"' || *iterator == '\'' ) - { -- *iterator = '\0'; -+ *iterator = '\0'; //bustage, modifying const *data - break; - } - } diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 1abf1ad..aa1d865 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,17 +1,15 @@ Name: xmlcopyeditor -Version: 1.2.0.4 -Release: 15%{?dist} +Version: 1.2.1.3 +Release: 1%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ -Source0: http://prdownloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz -Patch0: xmlcopyeditor-1.1.0.6-defaultbrowser.patch -Patch1: xmlcopyeditor-1.2.0.4-gcc44.patch +Source0: http://downloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz -BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel -BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils +BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel intltool +BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils libappstream-glib %description XML Copy Editor is a fast, free, validating XML editor. @@ -21,13 +19,6 @@ XML Copy Editor is a fast, free, validating XML editor. find src -type f -print0 | xargs -0 chmod a-x tr -d '\r' < src/copying/gpl.txt > COPYING chmod a-x AUTHORS COPYING NEWS -%patch0 -p 1 -b .defaultbrowser -%patch1 -p 1 -b .gcc44 - -# let's fix the compilation error -# housestyle.h:71:19: error: stray ',' at end of member declaration -sed -i 's|error,|error|g' src/housestyle.h -sed -i 's|aspellDataPath,|,aspellDataPath,|g' src/housestyle.h %build %configure @@ -39,23 +30,31 @@ desktop-file-install --remove-category Application \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -sed -i -e "s/\(Icon=[^.]\+\).[^.]\+/\1/" $RPM_BUILD_ROOT%{_datadir}/applications/*%{name}.desktop #rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/po +%find_lang %{name} +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml + %post update-desktop-database &> /dev/null || : %postun update-desktop-database &> /dev/null || : -%files +%files -f %{name}.lang %doc AUTHORS COPYING NEWS %{_bindir}/* %{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/pixmaps/* +%{_datadir}/appdata/%{name}.appdata.xml +%{_mandir}/man1/%{name}* %changelog +* Thu Jul 30 2015 Adam Williamson - 1.2.1.3-1 +- update to newest upstream +- drop both patches and the inline sed fixes (all fixed upstream) + * Wed Jul 29 2015 Fedora Release Engineering - 1.2.0.4-15 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From 88ba9101b276c2a3af2fa14fdbdd615874fd1a8c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 18:04:03 +0100 Subject: [PATCH 33/59] Rebuilt for Boost 1.59 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index aa1d865..273300f 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Thu Aug 27 2015 Jonathan Wakely - 1.2.1.3-2 +- Rebuilt for Boost 1.59 + * Thu Jul 30 2015 Adam Williamson - 1.2.1.3-1 - update to newest upstream - drop both patches and the inline sed fixes (all fixed upstream) From 15a3ff6e1e9d5522381a86b36c7dc282a74c6237 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 16 Jan 2016 04:02:47 +0000 Subject: [PATCH 34/59] Rebuilt for Boost 1.60 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 273300f..a866949 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Sat Jan 16 2016 Jonathan Wakely - 1.2.1.3-3 +- Rebuilt for Boost 1.60 + * Thu Aug 27 2015 Jonathan Wakely - 1.2.1.3-2 - Rebuilt for Boost 1.59 From 955271c06ae34c07a328941b9444a8c0b86a0422 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:35:51 +0000 Subject: [PATCH 35/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index a866949..cb873f7 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.2.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Jonathan Wakely - 1.2.1.3-3 - Rebuilt for Boost 1.60 From f2f6b999cc7588d267293af11cdd37438fec4cdf Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Jan 2017 09:17:27 +0000 Subject: [PATCH 36/59] Rebuilt for Boost 1.63 --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index cb873f7..2a69c3d 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Fri Jan 27 2017 Jonathan Wakely - 1.2.1.3-5 +- Rebuilt for Boost 1.63 + * Fri Feb 05 2016 Fedora Release Engineering - 1.2.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From dbf78dde316251938536a952f2abc1bfc51344b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:57:14 +0000 Subject: [PATCH 37/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 2a69c3d..c64489c 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Jonathan Wakely - 1.2.1.3-5 - Rebuilt for Boost 1.63 From 15b935dce4182e6eb60be2ca15dab87449d369b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:13:15 +0000 Subject: [PATCH 38/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index c64489c..95aac69 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.2.1.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 54c1bcf75e4b1acf40689e9f6bfe6c80a22dfc68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:46:59 +0000 Subject: [PATCH 39/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 95aac69..7b33757 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.2.1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.2.1.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From dd40fa7786b7742b2686571bb75bb9ed88a5c826 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:46:40 +0000 Subject: [PATCH 40/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 7b33757..0b2620c 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.1.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.2.1.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 24a806cb33d53cd242a1f0c8ef06855e477270a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:23:17 +0000 Subject: [PATCH 41/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 0b2620c..f0e62ce 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -51,6 +51,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.1.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.2.1.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 95453d1358000b3e0f8b9ca87547cee31c8445fe Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:53:24 +0200 Subject: [PATCH 42/59] Add missing BuildRequires on gcc configure: error: no acceptable C compiler found in $PATH References: https://bugzilla.redhat.com/show_bug.cgi?id=1606742 Signed-off-by: Igor Gnatenko --- xmlcopyeditor.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index f0e62ce..1da595e 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -8,6 +8,7 @@ License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://downloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz +BuildRequires: gcc BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel intltool BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils libappstream-glib From 8b9dd48d6dd9aa6e6fa2294df3255658b9c0aa4f Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 21 Aug 2018 21:21:22 -0400 Subject: [PATCH 43/59] Rebuild with wxWidgets 3.0 and fix FTBFS (#1606742) --- xmlcopyeditor.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 1da595e..56089e7 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A fast, free, validating XML editor Group: Applications/Editors @@ -8,8 +8,8 @@ License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://downloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz -BuildRequires: gcc -BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel intltool +BuildRequires: gcc gcc-c++ +BuildRequires: wxGTK3-devel pcre-devel aspell-devel boost-devel intltool BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils libappstream-glib %description @@ -52,6 +52,9 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/%{name}* %changelog +* Wed Aug 22 2018 Scott Talbert - 1.2.1.3-11 +- Rebuild with wxWidgets 3.0 and fix FTBFS (#1606742) + * Sat Jul 14 2018 Fedora Release Engineering - 1.2.1.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1d7856c4dc441a4b556ffb8c005ce17cf41b14a8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 44/59] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xmlcopyeditor.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 56089e7..d3e386d 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -3,7 +3,6 @@ Version: 1.2.1.3 Release: 11%{?dist} Summary: A fast, free, validating XML editor -Group: Applications/Editors License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://downloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz From 3d3c17a0b14b98ba02894e8eda529ae7ca89b2a8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 29 Jan 2019 06:17:46 +0100 Subject: [PATCH 45/59] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xmlcopyeditor.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index d3e386d..cca99a5 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -35,12 +35,6 @@ desktop-file-install --remove-category Application \ %find_lang %{name} appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml -%post -update-desktop-database &> /dev/null || : - -%postun -update-desktop-database &> /dev/null || : - %files -f %{name}.lang %doc AUTHORS COPYING NEWS %{_bindir}/* From d19f115aab2a8f7c409bab40e6653bdafff42e04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:32:48 +0000 Subject: [PATCH 46/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index cca99a5..c57bf5a 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -45,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.2.1.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Aug 22 2018 Scott Talbert - 1.2.1.3-11 - Rebuild with wxWidgets 3.0 and fix FTBFS (#1606742) From 802e27228d81dcb4a447b7946165814d2ca77275 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:20:28 +0000 Subject: [PATCH 47/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index c57bf5a..9ce1f12 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -45,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.2.1.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.2.1.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 99fa4d87cfde87fd8d31e9dd12b476d893a47691 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:35:50 +0000 Subject: [PATCH 48/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 9ce1f12..b0417ed 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -45,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.2.1.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.2.1.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5fc17588a741ec5d48f5ae579646533591de9e4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:50:02 +0000 Subject: [PATCH 49/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index b0417ed..9ea3973 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -45,6 +45,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.2.1.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.2.1.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 3b53dfd76bf02e69b8fdf01be8d7938659a90597 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:31:05 +0000 Subject: [PATCH 50/59] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xmlcopyeditor.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 9ea3973..865cf3b 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -7,6 +7,7 @@ License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://downloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz +BuildRequires: make BuildRequires: gcc gcc-c++ BuildRequires: wxGTK3-devel pcre-devel aspell-devel boost-devel intltool BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils libappstream-glib From 5fe601a3e7f9f0cd03bb2d22a5168cc17c7255bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:09:24 +0000 Subject: [PATCH 51/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 865cf3b..c7948ee 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -46,6 +46,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.2.1.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.2.1.3-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e6d9afa26e545e5fc090fc7e0e7b1d212c7a001b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:42:48 +0000 Subject: [PATCH 52/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index c7948ee..d0cf823 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -46,6 +46,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.1.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 1.2.1.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2126fe23cefae1b116b55b7468b55c72f129df7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:15:20 +0000 Subject: [PATCH 53/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index d0cf823..2c44004 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -46,6 +46,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.1.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.2.1.3-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 28c8fbed3e0d8068dd4e318a65797dcac64e5fdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:17:13 +0000 Subject: [PATCH 54/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 2c44004..e351d20 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -46,6 +46,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.1.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.2.1.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 35e9b2e94a8a3345e781eab3a10fa1d3feb13c3c Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 4 Aug 2022 20:04:27 -0400 Subject: [PATCH 55/59] Rebuild with wxWidgets 3.2 --- xmlcopyeditor-wx3.2.patch | 11 +++++++++++ xmlcopyeditor.spec | 10 +++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 xmlcopyeditor-wx3.2.patch diff --git a/xmlcopyeditor-wx3.2.patch b/xmlcopyeditor-wx3.2.patch new file mode 100644 index 0000000..6e95a09 --- /dev/null +++ b/xmlcopyeditor-wx3.2.patch @@ -0,0 +1,11 @@ +diff -up xmlcopyeditor-1.2.1.3/src/xmlcopyeditor.cpp.wx32 xmlcopyeditor-1.2.1.3/src/xmlcopyeditor.cpp +--- xmlcopyeditor-1.2.1.3/src/xmlcopyeditor.cpp.wx32 2014-09-05 21:54:53.000000000 -0400 ++++ xmlcopyeditor-1.2.1.3/src/xmlcopyeditor.cpp 2022-08-04 19:57:04.794351751 -0400 +@@ -276,7 +276,6 @@ bool MyApp::OnInit() + case wxLANGUAGE_SPANISH_GUATEMALA: + case wxLANGUAGE_SPANISH_HONDURAS: + case wxLANGUAGE_SPANISH_MEXICAN: +- case wxLANGUAGE_SPANISH_MODERN: + case wxLANGUAGE_SPANISH_NICARAGUA: + case wxLANGUAGE_SPANISH_PANAMA: + case wxLANGUAGE_SPANISH_PARAGUAY: diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index e351d20..cb63804 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,22 +1,23 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 URL: http://xml-copy-editor.sourceforge.net/ Source0: http://downloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz +Patch0: xmlcopyeditor-wx3.2.patch BuildRequires: make BuildRequires: gcc gcc-c++ -BuildRequires: wxGTK3-devel pcre-devel aspell-devel boost-devel intltool +BuildRequires: wxGTK-devel pcre-devel aspell-devel boost-devel intltool BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils libappstream-glib %description XML Copy Editor is a fast, free, validating XML editor. %prep -%setup -q +%autosetup -p1 find src -type f -print0 | xargs -0 chmod a-x tr -d '\r' < src/copying/gpl.txt > COPYING chmod a-x AUTHORS COPYING NEWS @@ -46,6 +47,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Thu Aug 04 2022 Scott Talbert - 1.2.1.3-20 +- Rebuild with wxWidgets 3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 1.2.1.3-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 40168ec37a1e6f04be10b0c9879bf3fa318da08f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:37:26 +0000 Subject: [PATCH 56/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index cb63804..e87059b 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -47,6 +47,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.1.3-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Aug 04 2022 Scott Talbert - 1.2.1.3-20 - Rebuild with wxWidgets 3.2 From 45dc56b01e7e6700d00f98d2c78f590ae7e277df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:01:27 +0000 Subject: [PATCH 57/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index e87059b..3cc389d 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -47,6 +47,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.2.1.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.2.1.3-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a133b7b50cfdc00e41ee38664a1f1da25e208e8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:52:25 +0000 Subject: [PATCH 58/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlcopyeditor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec index 3cc389d..e626d87 100644 --- a/xmlcopyeditor.spec +++ b/xmlcopyeditor.spec @@ -1,6 +1,6 @@ Name: xmlcopyeditor Version: 1.2.1.3 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A fast, free, validating XML editor License: GPLv2 @@ -47,6 +47,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %{_mandir}/man1/%{name}* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.2.1.3-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.2.1.3-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 74c10bd8855216a79519ec698065df9c2709a9b1 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 1 Jul 2024 12:21:09 -0500 Subject: [PATCH 59/59] Orphaned for 6+ weeks --- .gitignore | 3 - dead.package | 1 + sources | 1 - xmlcopyeditor-wx3.2.patch | 11 --- xmlcopyeditor.spec | 194 -------------------------------------- 5 files changed, 1 insertion(+), 209 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xmlcopyeditor-wx3.2.patch delete mode 100644 xmlcopyeditor.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b93f9b1..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -xmlcopyeditor-1.2.0.2.tar.gz -/xmlcopyeditor-1.2.0.4.tar.gz -/xmlcopyeditor-1.2.1.3.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 f55bb16..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b8ec66bbf41d6dd10ffe704e5b5f4b5e xmlcopyeditor-1.2.1.3.tar.gz diff --git a/xmlcopyeditor-wx3.2.patch b/xmlcopyeditor-wx3.2.patch deleted file mode 100644 index 6e95a09..0000000 --- a/xmlcopyeditor-wx3.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xmlcopyeditor-1.2.1.3/src/xmlcopyeditor.cpp.wx32 xmlcopyeditor-1.2.1.3/src/xmlcopyeditor.cpp ---- xmlcopyeditor-1.2.1.3/src/xmlcopyeditor.cpp.wx32 2014-09-05 21:54:53.000000000 -0400 -+++ xmlcopyeditor-1.2.1.3/src/xmlcopyeditor.cpp 2022-08-04 19:57:04.794351751 -0400 -@@ -276,7 +276,6 @@ bool MyApp::OnInit() - case wxLANGUAGE_SPANISH_GUATEMALA: - case wxLANGUAGE_SPANISH_HONDURAS: - case wxLANGUAGE_SPANISH_MEXICAN: -- case wxLANGUAGE_SPANISH_MODERN: - case wxLANGUAGE_SPANISH_NICARAGUA: - case wxLANGUAGE_SPANISH_PANAMA: - case wxLANGUAGE_SPANISH_PARAGUAY: diff --git a/xmlcopyeditor.spec b/xmlcopyeditor.spec deleted file mode 100644 index e626d87..0000000 --- a/xmlcopyeditor.spec +++ /dev/null @@ -1,194 +0,0 @@ -Name: xmlcopyeditor -Version: 1.2.1.3 -Release: 23%{?dist} -Summary: A fast, free, validating XML editor - -License: GPLv2 -URL: http://xml-copy-editor.sourceforge.net/ -Source0: http://downloads.sourceforge.net/xml-copy-editor/%name-%version.tar.gz -Patch0: xmlcopyeditor-wx3.2.patch - -BuildRequires: make -BuildRequires: gcc gcc-c++ -BuildRequires: wxGTK-devel pcre-devel aspell-devel boost-devel intltool -BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils libappstream-glib - -%description -XML Copy Editor is a fast, free, validating XML editor. - -%prep -%autosetup -p1 -find src -type f -print0 | xargs -0 chmod a-x -tr -d '\r' < src/copying/gpl.txt > COPYING -chmod a-x AUTHORS COPYING NEWS - -%build -%configure -make %{?_smp_mflags} - -%install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -desktop-file-install --remove-category Application \ - --delete-original \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -#rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/po - -%find_lang %{name} -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml - -%files -f %{name}.lang -%doc AUTHORS COPYING NEWS -%{_bindir}/* -%{_datadir}/%{name} -%{_datadir}/applications/* -%{_datadir}/pixmaps/* -%{_datadir}/appdata/%{name}.appdata.xml -%{_mandir}/man1/%{name}* - -%changelog -* Sat Jan 27 2024 Fedora Release Engineering - 1.2.1.3-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.2.1.3-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2.1.3-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Aug 04 2022 Scott Talbert - 1.2.1.3-20 -- Rebuild with wxWidgets 3.2 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2.1.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2.1.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2.1.3-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 1.2.1.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.2.1.3-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.2.1.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.2.1.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.2.1.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Aug 22 2018 Scott Talbert - 1.2.1.3-11 -- Rebuild with wxWidgets 3.0 and fix FTBFS (#1606742) - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.1.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.2.1.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.2.1.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.2.1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.2.1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 1.2.1.3-5 -- Rebuilt for Boost 1.63 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.2.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 1.2.1.3-3 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 1.2.1.3-2 -- Rebuilt for Boost 1.59 - -* Thu Jul 30 2015 Adam Williamson - 1.2.1.3-1 -- update to newest upstream -- drop both patches and the inline sed fixes (all fixed upstream) - -* Wed Jul 29 2015 Fedora Release Engineering - 1.2.0.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 1.2.0.4-14 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.2.0.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jan 27 2015 Petr Machata - 1.2.0.4-12 -- Rebuild for boost 1.57.0 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.2.0.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.2.0.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 1.2.0.4-9 -- Rebuild for boost 1.55.0 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 1.2.0.4-7 -- Rebuild for boost 1.54.0 - -* Sun Feb 10 2013 Parag Nemade - 1.2.0.4-6 -- Add fix in spec file only for failed compilation - -* Sun Feb 10 2013 Parag Nemade - 1.2.0.4-5 -- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 -- Cleanup spec as per recently changed packaging guidelines - -* Sun Jul 22 2012 Fedora Release Engineering - 1.2.0.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Feb 10 2012 Petr Pisar - 1.2.0.4-3 -- Rebuild against PCRE 8.30 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.2.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri May 20 2011 Ignacio Vazquez-Abrams 1.2.0.4-1 -- Upstream update - -* Thu Mar 10 2011 Kalev Lember - 1.2.0.2-5 -- Rebuilt with xerces-c 3.1 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.2.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jul 14 2010 Dan Horák - 1.2.0.2-3 -- rebuilt against wxGTK-2.8.11-2 - -* Sat Sep 12 2009 Caolán McNamara 1.2.0.2-2 -- Resolves: rhbz#508867 rhbz#511552 FTBFS - -* Thu Feb 05 2009 Ignacio Vazquez-Abrams 1.2.0.2-1 -- Upstream update (http://sourceforge.net/news/?group_id=141776) - -* Wed Feb 13 2008 Ignacio Vazquez-Abrams 1.1.0.6-4 -- Fixed build under GCC 4.3 - -* Tue Jan 29 2008 Ignacio Vazquez-Abrams 1.1.0.6-3 -- Removed locale files for now -- Removed spurious license files -- Fixed debuginfo permissions -- Fixed desktop file handling - -* Mon Jan 28 2008 Ignacio Vazquez-Abrams 1.1.0.6-2 -- Changed search list of default browsers - -* Sun Jan 27 2008 Ignacio Vazquez-Abrams 1.1.0.6-1 -- Initial RPM release