[scidavis/f15] Hacks to make this package buildable.

Fabian Deutsch fabiand at fedoraproject.org
Mon Oct 17 07:45:54 UTC 2011


commit 5cd034f09c605ee0a776558a317779676e187970
Author: Fabian Deutsch <fabian.deutsch at gmx.de>
Date:   Mon Oct 17 09:45:03 2011 +0200

    Hacks to make this package buildable.
    
    Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de>

 scidavis.spec |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/scidavis.spec b/scidavis.spec
index 26e95bb..fa80044 100644
--- a/scidavis.spec
+++ b/scidavis.spec
@@ -5,12 +5,12 @@ Release:	5%{?dist}
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 #  svn export -r 1337 https://scidavis.svn.sourceforge.net/svnroot/scidavis/manual/0.2/ manual
 #  tar -cjvf scidavis-manual-0.2_`date --iso`.tar.bz2 manual
-Source1:	%{name}-manual-0.2_2010-05-02.tar.bz2
+#Source1:	%{name}-manual-0.2_2010-05-02.tar.bz2
 Patch0:		%{name}-pro.patch
 #fix installation paths of fitPlugins
 Patch1:		%{name}-fitPlugins.patch
 #fix manual building
-Patch2:		%{name}-manual.patch
+#Patch2:		%{name}-manual.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2+
 Group:		Applications/Engineering
@@ -51,15 +51,15 @@ Obsoletes:	%{name}-manual < 0.2.4-1
 The %{name}-doc package contains documentation for the %{name}.
 
 %prep
-%setup -q -a 1
+%setup -q -a 0
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
+#%patch2 -p0
 #fix spurious-executable-perm
 find . -type f -exec chmod 0644 {} \;
 #fix docbook to adapt different versions of fedora
-sed -i "s/VER-REL/`rpm -q docbook-dtds|sed "s/^[^0-9]*//;s/\.noarch//;\
-s/\./\\\./g"`/" manual/docbook-en/index.docbook
+#sed -i "s/VER-REL/`rpm -q docbook-dtds|sed "s/^[^0-9]*//;s/\.noarch//;\
+#s/\./\\\./g"`/" manual/docbook-en/index.docbook
 #fix default path for fitPlugins
 sed -i "s\/usr/lib/%{name}/plugins\%{_libdir}/%{name}/plugins\g" \
 	%{name}/src/ApplicationWindow.cpp
@@ -69,21 +69,22 @@ sed -i -e 's/Qt;Science;Physics;Math;Graphics;/Education;Science;DataVisualizati
 export PATH=%{_qt4_bindir}:$PATH
 %_qt4_qmake LIB=%{_libdir} SCIDOCDIR=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
-pushd manual
-make
-popd
-pushd man
+#pushd manual
+#make
+#popd
+#pushd man
 #docbook2man manpage.sgml
-echo ".so man1/SciDAVis.1" > %{name}.1
-popd
+#echo ".so man1/SciDAVis.1" > %{name}.1
+#popd
 
 %install
 rm -rf %{buildroot}
 make INSTALL_ROOT="%{buildroot}" install
 #fix wrong manual path(important!!!)
-mv %{buildroot}%{_docdir}/%{name}-%{version}/html %{buildroot}%{_docdir}/%{name}-%{version}/manual
-install -d %{buildroot}%{_mandir}/man1
-install -D -pm 644  man/*.1 %{buildroot}%{_mandir}/man1/
+#mv %{buildroot}%{_docdir}/%{name}-%{version}/html %{buildroot}%{_docdir}/%{name}-%{version}/manual
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/manual
+#install -d %{buildroot}%{_mandir}/man1
+#install -D -pm 644  man/*.1 %{buildroot}%{_mandir}/man1/
 install -d %{buildroot}%{_datadir}/%{name}/translations
 install -D -pm 644 %{name}/translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
 #remove symlinks
@@ -129,7 +130,7 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_docdir}/%{name}-%{version}
-%{_mandir}/man1/*.1*
+#%{_mandir}/man1/*.1*
 %{_datadir}/applications/*
 %{_datadir}/mime/packages/*.xml
 %{_datadir}/mimelnk/application/x-sciprj.desktop
@@ -139,6 +140,7 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
+# empty directory as a dummy so teh subpackage doesn't get lost
 %{_docdir}/%{name}-%{version}/manual
 
 %changelog


More information about the scm-commits mailing list