[texmaker/f18] Update to 3.5.2

Deji Akingunola deji at fedoraproject.org
Fri Feb 22 17:05:11 UTC 2013 

commit 8eb00f9eb7151f702a493aebfa23d754e66bb91e
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Fri Feb 22 12:05:06 2013 -0500

    Update to 3.5.2

 sources                                       |    2 +-
 texmaker-build-fix.patch                      |   11 +++++
 texmaker-tools.patch => texmaker-fedora.patch |   59 +++++++++++++++++++------
 texmaker.spec                                 |   16 +++---
 4 files changed, 65 insertions(+), 23 deletions(-)
---
diff --git a/sources b/sources
index 3760060..b9e46e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ea033ad9890cd8ea5c3ff9e633fcfe8  texmaker-3.5.tar.bz2
+45eebb530e9516215665faf6d9dffe09  texmaker-3.5.2.tar.bz2
diff --git a/texmaker-build-fix.patch b/texmaker-build-fix.patch
new file mode 100644
index 0000000..ec04fae
--- /dev/null
+++ b/texmaker-build-fix.patch
@@ -0,0 +1,11 @@
+--- texmaker.h	2012-10-29 12:08:28.000000000 -0400
++++ texmaker.h.new	2013-02-22 10:44:17.644977963 -0500
+@@ -121,7 +121,7 @@
+ XmlTagsListWidget *MpListWidget, *PsListWidget, *leftrightWidget, *tikzWidget, *asyWidget;
+ SymbolListWidget *RelationListWidget, *ArrowListWidget, *MiscellaneousListWidget, *DelimitersListWidget, *GreekListWidget, *MostUsedListWidget, *FavoriteListWidget;
+ QTreeWidget *StructureTreeWidget;
+-QVBoxLayout *OutputLayoutV, *CentralLayoutBis,*LeftPanelLayoutBis,;
++QVBoxLayout *OutputLayoutV, *CentralLayoutBis,*LeftPanelLayoutBis;
+ QHBoxLayout *OutputLayoutH, *LeftPanelLayout, *CentralLayout;
+ QTableWidget *OutputTableWidget;
+ //menu-toolbar
diff --git a/texmaker-tools.patch b/texmaker-fedora.patch
similarity index 76%
rename from texmaker-tools.patch
rename to texmaker-fedora.patch
index db9b2af..ea77819 100644
--- a/texmaker-tools.patch
+++ b/texmaker-fedora.patch
@@ -1,6 +1,6 @@
---- texmaker.cpp	2012-08-17 11:48:37.000000000 -0400
-+++ texmaker.cpp.new	2012-09-20 18:58:14.280840375 -0400
-@@ -4079,28 +4079,9 @@
+--- texmaker.cpp	2012-11-02 06:16:13.000000000 -0400
++++ texmaker.cpp.new	2013-02-22 11:02:24.904688947 -0500
+@@ -4091,29 +4091,10 @@
  metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
  // xdvi %.dvi  -sourceposition @:%.tex
  // kdvi "file:%.dvi#src:@ %.tex"
@@ -26,13 +26,15 @@
 -		}break;
 -	}
 -
+-
 +viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString();
 +viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString();
 +viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString();
- 
++ 
  
  ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
-@@ -4291,7 +4272,7 @@
+ asymptote_command=config->value("Tools/Asymptote","asy %.asy").toString();
+@@ -4304,7 +4285,7 @@
  #ifdef DEBIAN_SPELLDIR
  QString dicDir=PREFIX"/share/myspell/dicts/";
  #else
@@ -41,15 +43,15 @@
  #endif
  #endif
  
-@@ -10615,4 +10596,4 @@
+@@ -10747,4 +10728,4 @@
  	    UpdateBibliography();
  	    }
  	}
 -}
 \ No newline at end of file
 +}
---- texmaker.pro	2012-08-16 09:54:11.000000000 -0400
-+++ texmaker.pro.new	2012-09-20 19:02:03.635526065 -0400
+--- texmaker.pro	2012-11-02 06:21:34.000000000 -0400
++++ texmaker.pro.new	2013-02-22 11:05:56.937226495 -0500
 @@ -4,7 +4,8 @@
  QT += network \
        xml \
@@ -57,10 +59,10 @@
 -CONFIG	+= qt warn_off release
 +CONFIG	+= qt warn_off release link_pkgconfig
 +PKGCONFIG = hunspell
- TEXMAKERVERSION=3.5
+ TEXMAKERVERSION=3.5.2
  DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
  DEFINES += HAVE_SPLASH
-@@ -67,25 +68,6 @@
+@@ -68,25 +69,6 @@
  	synctex_parser_utils.h \
  	usertagslistwidget.h \
  	addtagdialog.h \
@@ -86,7 +88,7 @@
  	singleapp/qtlocalpeer.h \
  	singleapp/qtlockedfile.h \
  	singleapp/qtsingleapplication.h \
-@@ -171,18 +153,6 @@
+@@ -173,18 +155,6 @@
  	synctex_parser_utils.c \
  	usertagslistwidget.cpp \
  	addtagdialog.cpp \
@@ -105,7 +107,7 @@
  	singleapp/qtlocalpeer.cpp \
  	singleapp/qtlockedfile.cpp \
  	singleapp/qtsingleapplication.cpp \
-@@ -384,35 +354,7 @@
+@@ -387,35 +357,7 @@
  	locale/texmaker_hu.qm \
  	locale/texmaker_sr.qm \
  	locale/texmaker_el.qm \
@@ -138,12 +140,41 @@
 -	dictionaries/README_DIC_fr_FR.txt \
 -	dictionaries/README_es_ES.txt \
 -	dictionaries/README_en_US.txt
-+	locale/texmaker_se.qm 
++	locale/texmaker_se.qm
  INSTALLS += utilities
  
  desktop.path = $${DESKTOPDIR}
+@@ -530,27 +472,7 @@
+ 	locale/texmaker_hu.qm \
+ 	locale/texmaker_sr.qm \
+ 	locale/texmaker_el.qm \
+-	locale/texmaker_se.qm \
+-	dictionaries/nl_NL.aff \
+-	dictionaries/nl_NL.dic \
+-	dictionaries/de_DE.aff \
+-	dictionaries/de_DE.dic \
+-	dictionaries/en_GB.aff \
+-	dictionaries/en_GB.dic \
+-	dictionaries/en_US.aff \
+-	dictionaries/en_US.dic \
+-	dictionaries/es_ES.aff \
+-	dictionaries/es_ES.dic \
+-	dictionaries/fr_FR.aff \
+-	dictionaries/fr_FR.dic \
+-	dictionaries/it_IT.aff \
+-	dictionaries/it_IT.dic \
+-	dictionaries/hu_HU.aff \
+-	dictionaries/hu_HU.dic \
+-	dictionaries/cs_CZ.aff \
+-	dictionaries/cs_CZ.dic \
+-	dictionaries/pl_PL.aff \
+-	dictionaries/pl_PL.dic 
++	locale/texmaker_se.qm 
+ INSTALLS += utilities
+ 
+ others.path = texmakerwin32
 --- spellerdialog.h	2011-02-25 14:19:34.000000000 -0500
-+++ spellerdialog.h.new	2012-09-20 19:03:02.717587123 -0400
++++ spellerdialog.h.new	2013-02-22 11:06:54.931225406 -0500
 @@ -13,7 +13,7 @@
  
  #include "ui_spellerdialog.h"
diff --git a/texmaker.spec b/texmaker.spec
index 7f1eeea..a272b55 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,18 +1,18 @@
 Summary:	LaTeX editor
 Name:		texmaker
-Version:	3.5
+Version:	3.5.2
 Release:	1%{?dist}
 Epoch:		1
 License:	GPLv2+
 Group:		Applications/Publishing
 URL:		http://www.xm1math.net/texmaker/
 Source:		http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	qt4-devel, qt4-webkit-devel, hunspell-devel, poppler-qt4-devel
 BuildRequires:	desktop-file-utils
 Requires:	tetex-latex, tetex-dvipost, tetex-xdvi
 # Patch to use default Fedora's document viewer and system's hunspell
-Patch0:		%{name}-tools.patch
+Patch0:		%{name}-fedora.patch
+Patch1:		%{name}-build-fix.patch
 
 %description
 Texmaker is a program, that integrates many tools needed to develop 
@@ -23,6 +23,7 @@ license
 %prep
 %setup -q
 %patch0 -p0 -b .tools
+%patch1 -p0 -b .fix
  
 %build
 export QTDIR=%{_libdir}/qt4
@@ -31,8 +32,7 @@ qmake-qt4 -unix texmaker.pro
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make INSTALL_ROOT=%{buildroot} install
+make INSTALL_ROOT=%{buildroot} install INSTALL="install -p"
 
 install -Dp -m 0644 utilities/texmaker16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/texmaker.png
 install -Dp -m 0644 utilities/texmaker22x22.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/texmaker.png
@@ -53,9 +53,6 @@ desktop-file-install --vendor fedora			\
 	--remove-category X-Misc			\
 	utilities/texmaker.desktop
 
-%clean
-rm -rf %buildroot
-
 %post
 update-desktop-database &> /dev/null ||:
 
@@ -82,6 +79,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/pixmaps/texmaker.png
 
 %changelog
+* Fri Feb 22 2013 Deji Akingunola <dakingun at gmail.com> - 3.5.2-1
+- Update to 3.5.2
+
 * Thu Sep 20 2012 Deji Akingunola <dakingun at gmail.com> - 3.5-1
 - Update to 3.5

More information about the scm-commits mailing list