From 9c792418a227034441b8e3e5e7a670b21329b310 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 29 Jan 2008 17:52:29 +0000 Subject: [PATCH 1/5] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 001b2cbc5bdcdbfe4b88e3c82ede484689bae965 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Tue, 29 Jan 2008 19:56:38 +0000 Subject: [PATCH 2/5] 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 f57a5999ae4fec1c2ff8da6ad0275d4eaea6484d Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Tue, 29 Jan 2008 20:06:45 +0000 Subject: [PATCH 3/5] 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 565a8db3740fec051dd2b4074721296b51640207 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:12 +0000 Subject: [PATCH 4/5] 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 93c5054c147b387f4f225e81ad03400b646e8cfe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:55:58 +0000 Subject: [PATCH 5/5] 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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8