X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Flyx.spec.in;h=fbefa0d5f28beb00b07379df722d70bec4c19944;hb=5be1c17c7cae5fff5b916427a35fb5b59743a5da;hp=d9f6a1dd64a46b9a0ef8436075c656af4e5af188;hpb=b1fb4b15f27655c71fe817778b11829bd546110c;p=lyx.git

diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index d9f6a1dd64..fbefa0d5f2 100644
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -1,16 +1,18 @@
+%define frontend @RPM_FRONTEND@
+%define version_suffix @RPM_VERSION_SUFFIX@
+
 Summary: A WYSIWYM (What You See Is What You Mean) frontend to LaTeX
 Name: @PACKAGE@
 Version: @VERSION@
-Release: 1
+Release: 1_%{frontend}
 Copyright: see COPYING file
-Group: X11/Editors
-Url: http://www.lyx.org/
+Group: Applications/Publishing
+URL: http://www.lyx.org/
 Packager: Kayvan A. Sylvan <kayvan@sylvan.com>
-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{PACKAGE_VERSION}.tar.gz
-BuildRoot: /var/tmp/rpm/lyx-root
-Icon: lyx.xpm
-Prefix: /usr
-Requires: xforms >= 0.88, tetex-xdvi, tetex, tetex-latex
+Source: ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Icon: %{name}.xpm
+Prefix: %{_prefix}
 Obsoletes: tetex-lyx
 
 %description
@@ -30,44 +32,39 @@ to the backends (like LaTeX) that are specifically designed for the task.
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 
+This is LyX built with the %{frontend} frontend.
+
 %prep
 %setup
 
 %build
 unset LINGUAS || true
-CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=/usr --without-warnings --with-included-string
-# The following check is to ensure that lyx RPMs generated on RH 6.X machines
-# with gcc-2.95 still run against older Redhat OS/compiler combinations.
-# It will eventually be ripped out.
-if [ -r /usr/lib/libstdc++-libc6.1-1.so.2 ]
-then
-	make CXX=gcc LYX_LIBS='/usr/lib/libstdc++-libc6.1-1.so.2 -lforms -lXpm'
-else
-	make
-fi
-
+./configure --with-frontend=%{frontend} --prefix=%{_prefix} \
+	--mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \
+ 	--without-warnings --disable-debug --enable-optimization=-O2 \
+	%{version_suffix}
+make
 
 %install
 unset LINGUAS || true
 rm -rf ${RPM_BUILD_ROOT}
 install -d -m 755 ${RPM_BUILD_ROOT}
-make prefix=${RPM_BUILD_ROOT}/usr install
-gzip -f9 ${RPM_BUILD_ROOT}/usr/man/man?/*
+make DESTDIR=${RPM_BUILD_ROOT} install
+gzip -f9 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
 
 #
-# Set up the lyx-specific class files where TeX can see then
+# Set up the lyx-specific class files where TeX can see them
 #
-TEXMF=/usr/share/texmf
+TEXMF=%{_datadir}/texmf
 mkdir -p ${RPM_BUILD_ROOT}${TEXMF}/tex/latex
-mv ${RPM_BUILD_ROOT}/usr/share/lyx/tex \
-      ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/lyx
+mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/tex \
+      ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/%{name}
 
 #
 # Miscellaneous files
 #
-cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}/usr/share/lyx/images/
-cp lib/reLyX/README README.reLyX
+# Don't use %{name}.xpm, this will not work with --version-suffix
+cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/images/
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -77,35 +74,29 @@ rm -rf ${RPM_BUILD_ROOT}
 texhash
 
 # Before configuring lyx for the local system
-# PATH needs to be imported 
-if [ -f /etc/profile ]; then 
+# PATH needs to be imported
+if [ -f /etc/profile ]; then
     . /etc/profile
-fi 
+fi
 #
 # Now configure LyX
 #
 echo "Configuring LyX for your system..."
-cd $RPM_INSTALL_PREFIX/share/lyx
+cd %{_datadir}/%{name}
 ./configure --srcdir
 
-# Fix reLyX perl program if the prefix is non-standard
-if [ "$RPM_INSTALL_PREFIX" != "/usr" ]
-then
-    perl -pi -e "s!/usr/share/lyx!$RPM_INSTALL_PREFIX/share/lyx!" \
-        ${RPM_INSTALL_PREFIX}/bin/reLyX
-fi
-
 %postun
 # Fix the TeX file hash
 #
 texhash
 
 %files
-%attr(-,root,root) %doc ABOUT-NLS ANNOUNCE COPYING 
-%attr(-,root,root) %doc README UPGRADING ChangeLog NEWS
-%attr(-,root,root) %doc lib/CREDITS README.reLyX
-%attr(-,root,root) /usr/bin/*
-%attr(-,root,root) /usr/man/*
-%attr(-,root,root) /usr/share/locale/*/LC_MESSAGES/*
-%attr(-,root,root) /usr/share/lyx
-%attr(-,root,root) /usr/share/texmf/tex/latex/lyx
+%defattr(-,root,root)
+%doc ABOUT-NLS ANNOUNCE COPYING
+%doc README UPGRADING ChangeLog NEWS
+%doc lib/CREDITS
+%{_bindir}/*
+%{_mandir}/man?/*
+%{_datadir}/locale/*/LC_MESSAGES/*
+%{_datadir}/%{name}
+%{_datadir}/texmf/tex/latex/%{name}