rpms/xmlcopyeditor/devel xmlcopyeditor-1.1.0.6-defaultbrowser.patch, NONE, 1.1 xmlcopyeditor-1.1.0.6-nuke.patch, NONE, 1.1 xmlcopyeditor.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Tue Jan 29 19:53:12 UTC 2008
Author: ivazquez
Update of /cvs/pkgs/rpms/xmlcopyeditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4677/devel
Modified Files:
.cvsignore sources
Added Files:
xmlcopyeditor-1.1.0.6-defaultbrowser.patch
xmlcopyeditor-1.1.0.6-nuke.patch xmlcopyeditor.spec
Log Message:
Initial import
xmlcopyeditor-1.1.0.6-defaultbrowser.patch:
--- NEW FILE xmlcopyeditor-1.1.0.6-defaultbrowser.patch ---
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++ )
{
xmlcopyeditor-1.1.0.6-nuke.patch:
--- NEW FILE xmlcopyeditor-1.1.0.6-nuke.patch ---
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
--- NEW FILE xmlcopyeditor.spec ---
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 <ivazqueznet+rpm at gmail.com> 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 <ivazqueznet+rpm at gmail.com> 1.1.0.6-2
- Changed search list of default browsers
* Sun Jan 27 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.1.0.6-1
- Initial RPM release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmlcopyeditor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 29 Jan 2008 17:52:21 -0000 1.1
+++ .cvsignore 29 Jan 2008 19:52:34 -0000 1.2
@@ -0,0 +1 @@
+xmlcopyeditor-1.1.0.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlcopyeditor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 29 Jan 2008 17:52:21 -0000 1.1
+++ sources 29 Jan 2008 19:52:34 -0000 1.2
@@ -0,0 +1 @@
+29350234faca3ad978ff74dbbf7f3ef5 xmlcopyeditor-1.1.0.6.tar.gz
More information about the fedora-extras-commits
mailing list