Accepting request 54812 from Publishing

Accepted submit request 54812 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/54812
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texmaker?expand=0&rev=2

texmaker-2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca16ec07b00edbd8305a0486bbc8723638ba878c47956da428fbf129847386df
-size 3221516

texmaker-2.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e90457448409f2b091bfd28b4be2315048e6a99d5668998be4d08fccfb0904e4
+size 3270064

texmaker-correct-doc-location.patch

@@ -0,0 +1,13 @@
+diff -ur texmaker-2.1.orig//texmaker.pro texmaker-2.1//texmaker.pro
+--- texmaker-2.1.orig//texmaker.pro	2010-10-27 02:50:58.000000000 +0530
++++ texmaker-2.1//texmaker.pro	2010-12-03 07:46:24.384950103 +0530
+@@ -224,9 +224,6 @@
+ 	utilities/style.css \
+ 	utilities/up.gif \
+ 	utilities/up_d.gif \
+-	utilities/AUTHORS \
+-	utilities/COPYING \
+-	utilities/CHANGELOG.txt \
+ 	utilities/texmaker16x16.png \
+ 	utilities/texmaker22x22.png \
+ 	utilities/texmaker32x32.png \

texmaker-pdflatex-synctex-by-default.patch

@@ -0,0 +1,12 @@
+diff -ur texmaker-2.1.orig//texmaker.cpp texmaker-2.1//texmaker.cpp
+--- texmaker-2.1.orig//texmaker.cpp	2010-10-27 00:17:02.000000000 +0530
++++ texmaker-2.1//texmaker.cpp	2010-12-02 04:19:38.678178151 +0530
+@@ -2466,7 +2466,7 @@
+ ps2pdf_command=config->value("Tools/Ps2pdf","ps2pdf %.ps").toString();
+ makeindex_command=config->value("Tools/Makeindex","makeindex %.idx").toString();
+ bibtex_command=config->value("Tools/Bibtex","bibtex %.aux").toString();
+-pdflatex_command=config->value("Tools/Pdflatex","pdflatex -interaction=nonstopmode %.tex").toString();
++pdflatex_command=config->value("Tools/Pdflatex","pdflatex -synctex=1 -interaction=nonstopmode %.tex").toString();
+ dvipdf_command=config->value("Tools/Dvipdf","dvipdfm %.dvi").toString();
+ metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
+ // xdvi %.dvi  -sourceposition @:%.tex

texmaker.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Dec  3 01:35:46 UTC 2010 - badshah400@gmail.com
+
+- Improve handling of doc entries, making them go into standard doc
+  location
+ 
+-------------------------------------------------------------------
+Wed Dec  1 23:09:48 UTC 2010 - badshah400@gmail.com
+
+- Include texmaker-pdflatex-synctex-by-default.patch to enable
+  source and pdf syncing into pdflatex builds
+
+-------------------------------------------------------------------
+Wed Oct 27 15:41:18 UTC 2010 - badshah400@gmail.com
+
+- Update to version 2.1
+  - synctex support has been added
+  - the bug about searching an empty text in the pdf viewer has been fixed
+  - after a new compilation, the pdf viewer stays at the same page
+  - the bug about the completion while typing "\begin{" has been fixed 
+  - the recent files menu can now contain 10 items
+- Install appropriate doc files: license, copying, changelog
+- Correct URL in spec file
+
 -------------------------------------------------------------------
 Tue Aug 10 04:18:41 UTC 2010 - badshah400@gmail.com
 

texmaker.spec

@@ -18,30 +18,42 @@
 
 
 Name:           texmaker
-Summary:        Free cross-platform LaTeX editor
+Version:        2.1
-Version:        2.0
 Release:        1
-Url:            http://www.xm1math.net/texmaker/index.html
-Source:         texmaker-%{version}.tar.bz2
 License:        GPLv2
+Summary:        Free cross-platform LaTeX editor
+Url:            http://www.xm1math.net/texmaker/
 Group:          Productivity/Publishing/TeX/Frontends
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source:         texmaker-%{version}.tar.bz2
-BuildRequires:  libqt4-devel >= 4.6.1
+# PATCH-FIX-UPSTREAM texmaker-pdflatex-synctex-by-default.patch badshah400@gmail.com -- Enable synctex integration into pdflatex by default
-BuildRequires:  libpoppler-qt4-devel
+Patch0:         texmaker-pdflatex-synctex-by-default.patch
-BuildRequires:  update-desktop-files
+# PATCH-FIX-UPSTREAM texmaker-correct-doc-location.patch badshah400@gmail.com -- Handle doc files in the spec file rather than placing them in %{_datadir} during compilation
+Patch1:         texmaker-correct-doc-location.patch
+BuildRequires:  fdupes
 BuildRequires:  libQtWebKit-devel
+BuildRequires:  libpoppler-qt4-devel
+BuildRequires:  libqt4-devel >= 4.6.1
+BuildRequires:  update-desktop-files
+Requires:       hunspell
 Requires:       libQtWebKit4 >= 4.6.1
-Requires:       texlive texlive-bin texlive-latex texlive-bin-latex texlive-context hunspell  
+Requires:       texlive
+Requires:       texlive-bin
+Requires:       texlive-bin-latex
+Requires:       texlive-context
+Requires:       texlive-latex
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 
 %description
-Texmaker is a free LaTeX editor, that integrates many tools 
+Texmaker is a free LaTeX editor, that integrates many tools
 needed to develop documents with LaTeX, in just one application.
-Texmaker runs on unix, macosx and windows systems and is released 
+Texmaker runs on unix, macosx and windows systems and is released
 under the GPL license .
 #
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 #
 
 %build
@@ -50,15 +62,15 @@ PATH=$QTDIR/bin:$PATH
 LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
 DYLD_LIBRARY_PATH=$QTDIR/lib:$DYLD_LIBRARY_PATH
 export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
-PREFIX=$RPM_BUILD_ROOT/usr
+PREFIX=%{buildroot}%{_prefix}
 qmake -unix texmaker.pro
-make INSTALL_ROOT=$RPM_BUILD_ROOT
+make INSTALL_ROOT=%{buildroot}
 #
 
 %install
-make INSTALL_ROOT=$RPM_BUILD_ROOT install
+make INSTALL_ROOT=%{buildroot} install
-#
 %suse_update_desktop_file %{name}
+%fdupes %{buildroot}%{_datadir}/
 
 %clean
 rm -rf %{buildroot}
@@ -66,10 +78,10 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-#%doc COPYING README
+%doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
-/usr/bin/texmaker
+%{_bindir}/texmaker
-/usr/share/applications/texmaker.desktop
+%{_datadir}/applications/texmaker.desktop
-/usr/share/pixmaps/texmaker.png
+%{_datadir}/pixmaps/texmaker.png
-/usr/share/texmaker/
+%{_datadir}/texmaker/
 
 %changelog