diff --git a/.gitignore b/.gitignore index 1d97d89..125b89b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ texworks-0.2.3.tar.gz /texworks-0.4.3-r858.tar.gz /texworks-0.4.4-r1004.tar.gz /texworks-0.4.5-r1281.tar.gz +/texworks-release-0.4.6.tar.gz diff --git a/sources b/sources index e26003b..bf8591b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04f3939501f6935c0f24f10042993d26 texworks-0.4.5-r1281.tar.gz +1ac0db22ce2185f01a844eb99cee33c4 texworks-release-0.4.6.tar.gz diff --git a/texworks.spec b/texworks.spec index 54f740e..2d473b3 100644 --- a/texworks.spec +++ b/texworks.spec @@ -1,23 +1,19 @@ -%global rev 1281 -%global py_ver %(%{__python} -c "import sys;sys.stdout.write(sys.version[:3])") - Name: texworks -Version: 0.4.5 -Release: 5%{?dist} +Version: 0.4.6 +Release: 1%{?dist} Summary: A simple IDE for authoring TeX documents - Group: Applications/Editors License: GPLv2+ URL: http://tug.org/texworks/ -Source0: http://texworks.googlecode.com/files/%{name}-%{version}-r%{rev}.tar.gz +Source0: https://github.com/TeXworks/texworks/archive/release-%{version}/texworks-release-%{version}.tar.gz BuildRequires: hunspell-devel BuildRequires: poppler-qt4-devel BuildRequires: python2-devel BuildRequires: lua-devel BuildRequires: desktop-file-utils -BuildRequires: perl +BuildRequires: cmake # Description adopted from Debian with modification %description @@ -28,51 +24,20 @@ simple interface accessible to casual and non-technical users. You may install the texlive-* packages to make this program useful. %prep -%setup -q -# pkg-config file of Lua -perl -pi -e 's/(?<=lua)5\..*//' plugins-src/TWLuaPlugin/TWLuaPlugin.pro -# Python version -perl -pi -e 's/2\.6/%{py_ver}/' plugins-src/TWPythonPlugin/TWPythonPlugin.pro +%setup -q -n %{name}-release-%{version} %build -# build Lua scripting plugin -pushd plugins-src/TWLuaPlugin/ -%_qt4_qmake TW_PLUGINPATH=%{_libdir}/texworks +mkdir build +pushd build +%cmake .. -DWITH_PYTHON=ON -DTW_BUILD_ID=Fedora -DTeXworks_DIC_DIR=%{_datadir}/myspell -DTeXworks_PLUGIN_DIR=%{_libdir}/texworks -DCMAKE_BUILD_TYPE=RelWithDebInfo make %{?_smp_mflags} popd -# build Python scripting plugin -pushd plugins-src/TWPythonPlugin/ -%_qt4_qmake TW_PLUGINPATH=%{_libdir}/texworks -make %{?_smp_mflags} -popd - -# build the main program -%_qt4_qmake INSTALL_PREFIX=%{_prefix} DOCS_DIR=%{_docdir}/%{name} \ - TW_PLUGINPATH=%{_libdir}/texworks \ - TW_DICPATH=%{_datadir}/myspell \ - TW_BUILD_ID=Fedora -make %{?_smp_mflags} - - %install -rm -rf %{buildroot} -# install Lua scripting plugin -pushd plugins-src/TWLuaPlugin/ -make install INSTALL_ROOT=%{buildroot} +pushd build +%make_install INSTALL="install -p" popd -# install Python scripting plugin -pushd plugins-src/TWPythonPlugin/ -make install INSTALL_ROOT=%{buildroot} -popd - -# install the main program -make install INSTALL_ROOT=%{buildroot} - -%clean -rm -rf %{buildroot} - %post update-desktop-database &> /dev/null || : @@ -80,17 +45,19 @@ update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || : %files -%defattr(-,root,root,-) %{_docdir}/%{name}/ -%doc %{_datadir}/texworks-help/ %{_bindir}/%{name} %{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/* +%{_datadir}/appdata/* %changelog +* Sat Apr 11 2015 Robin Lee - 0.4.6-1 +- Update to 0.4.6 + * Mon Aug 18 2014 Fedora Release Engineering - 0.4.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild