Expand conditionals

This commit is contained in:
Mikolaj Izdebski 2018-11-29 12:42:46 +00:00
parent 2bfd7db662
commit 98810bb805

View File

@ -1,5 +1,3 @@
%bcond_without desktop
%bcond_without emacs
Summary: Fast Scanner Generator
Name: jflex
@ -23,13 +21,6 @@ BuildRequires: junit
BuildRequires: sonatype-oss-parent
BuildRequires: java-devel
BuildRequires: java_cup
%if %{with desktop}
BuildRequires: desktop-file-utils
%endif
%if %{with emacs}
BuildRequires: emacs
Requires: emacs-filesystem >= %{_emacs_version}
%endif
# Explicit javapackages-tools requires since scripts use
# /usr/share/java-utils/java-functions
Requires: javapackages-tools
@ -68,10 +59,6 @@ java -jar $(find-jar java_cup) -parser LexParse -interface -destdir src/main/jav
jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex
%mvn_build
%if %{with emacs}
# Compile Emacs jflex-mode source
%{_emacs_bytecompile} lib/jflex-mode.el
%endif
%install
%mvn_install
@ -84,31 +71,14 @@ install -d -m 755 %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
# .desktop + icons
%if %{with desktop}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
install -d -m 755 %{buildroot}%{_datadir}/pixmaps
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%endif
# Emacs files
%if %{with emacs}
install -d -m 755 %{buildroot}%{_emacs_sitelispdir}/%{name}
install -p -m 644 lib/jflex-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}
install -p -m 644 lib/jflex-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name}
%endif
%files -f .mfiles
%doc doc
%doc COPYRIGHT
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%if %{with desktop}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%endif
%if %{with emacs}
%{_emacs_sitelispdir}/%{name}
%endif
%files javadoc
%doc COPYRIGHT