diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1397048 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +xmlcopyeditor-1.2.0.2.tar.gz +/xmlcopyeditor-1.2.0.4.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..724ce27 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +0b85649a4ef6af817b1c4089237b2a57 xmlcopyeditor-1.2.0.4.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.2.0.4-gcc44.patch b/xmlcopyeditor-1.2.0.4-gcc44.patch new file mode 100644 index 0000000..7adb6aa --- /dev/null +++ b/xmlcopyeditor-1.2.0.4-gcc44.patch @@ -0,0 +1,118 @@ +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 new file mode 100644 index 0000000..d6e4e2a --- /dev/null +++ b/xmlcopyeditor.spec @@ -0,0 +1,112 @@ +Name: xmlcopyeditor +Version: 1.2.0.4 +Release: 8%{?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 + +BuildRequires: wxGTK-devel >= 2.8 pcre-devel aspell-devel boost-devel +BuildRequires: xerces-c-devel libxslt-devel expat-devel desktop-file-utils + +%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 .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} + +%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 +sed -i -e "s/\(Icon=[^.]\+\).[^.]\+/\1/" $RPM_BUILD_ROOT%{_datadir}/applications/*%{name}.desktop +#rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/po + +%post +update-desktop-database &> /dev/null || : + +%postun +update-desktop-database &> /dev/null || : + +%files +%doc AUTHORS COPYING NEWS +%{_bindir}/* +%{_datadir}/%{name} +%{_datadir}/applications/* +%{_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 + +* 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