Attachment 14140 Details for Bug 28938 – Diff with changes done from current spec in Cauldron

[patch] Diff with changes done from current spec in Cauldron

lyx-spec.diff (text/plain), 3.52 KB, created by katnatek on 2023-11-07 04:26:42 CET

(hide)

Description:

Filename:

MIME Type:

Creator: katnatek

Created: 2023-11-07 04:26:42 CET

Size: 3.52 KB

patch

obsolete

>Index: SPECS/lyx.spec
>===================================================================
>--- SPECS/lyx.spec	(revisiÃ³n: 2004882)
>+++ SPECS/lyx.spec	(copia de trabajo)
>@@ -1,16 +1,25 @@
> %define lyxver  %(echo %{version} | cut -d. -f1,2)
> 
> Name:           lyx
>-Version:        2.3.6.1
>-Release:        %mkrel 2
>+Version:        2.3.7
>+Release:        %mkrel 1
> Summary:        A word processor for the Desktop Environment
> Group:          Office/Word processor
> License:        GPLv2+
> URL:            https://www.lyx.org/
>-Source0:        https://ftp.lip6.fr/pub/lyx/stable/%{lyxver}.x/%{name}-%{version}.tar.xz
>-Patch0:         lyx-2.3.6-python3.patch
>-Patch1:         lyx-2.3.6.1-build-with-GCC12.patch
>+Source0:        https://ftp.lip6.fr/pub/lyx/stable/%{lyxver}.x/%{name}-%{version}-1.tar.xz
> 
>+## upstreamable patches
>+# already part of 2.4.x source and fixes
>+# https://bugzilla.redhat.com/show_bug.cgi?id=1965118
>+Patch0:  lyx-2.3.6-layout2layout.patch
>+
>+Patch1:         lyx-2.3.6-python3.patch
>+#From debian
>+#http://lists.lyx.org/pipermail/lyx-devel/2022-February.txt
>+Patch2: 		lyx-Fix-GuiView.patch
>+Patch3:         lyx-2.3.7-build-with-GCC12.patch
>+
> BuildRequires:  bc
> BuildRequires:  boost-devel
> BuildRequires:  cmake
>@@ -50,6 +59,16 @@
> Requires:       texlive-dist
> Requires:       xdg-utils
> 
>+#Equivalent to suse recommends
>+Recommends:		biber
>+Recommends:		texlive-doc
>+
>+# Some stuff needed for LyX's documentation:
>+Recommends:     texlive-collection-basic
>+Recommends:		texlive-fontsextra
>+
>+#End of stuff recommended in suse
>+
> %description
> LyX is a modern approach of writing documents with a computer which breaks
> with the tradition of the obsolete typewriter concept.  It is designed for
>@@ -62,6 +81,13 @@
> %prep
> %autosetup -p1
> 
>+
>+# prefer xdg-open over alternatives in configuration
>+for prog in xv firefox kghostview pdfview xdvi
>+do
>+    sed -i -e "s/'$prog'/'xdg-open', '$prog'/" lib/configure.py
>+done
>+
> # Switch to enchant2
> sed -i -e '/ENCHANT_LIBRARY/s,"enchant","enchant-2",g' \
>   -e 's,/usr/include/enchant,%{_includedir}/enchant-2,g' \
>@@ -88,8 +114,6 @@
> mkdir -p %{buildroot}${TEXMF}/tex/latex
> mv %{buildroot}%{_datadir}/%{name}/tex %{buildroot}${TEXMF}/tex/latex/%{name}
> 
>-%find_lang %{name}
>-
> # icon
> install -p -D -m644 lib/images/lyx.png \
>   %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.png
>@@ -106,6 +130,13 @@
> mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
> rm -rf %{buildroot}%{_datadir}/lyx/fonts
> 
>+#Missing Stuff
>+pushd lib/doc
>+for doc in $(find *  -type f); do
>+	install -Dm0644 $doc %{buildroot}%{_datadir}/lyx/doc/$doc
>+done
>+popd
>+
> ## Now configure LyX
> pushd %{buildroot}%{_datadir}/%{name}
> %{__python3} configure.py > /dev/null
>@@ -116,6 +147,12 @@
> # bash completion
> install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
> 
>+# appdata
>+install -p -D lib/appdata.xml %{buildroot}%{_metainfodir}/lyx.appdata.xml
>+
>+#List of files
>+find %{buildroot}/* -type f|sed -e 's|%{buildroot}||g' > %{name}.lang
>+
> %check
> desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
> # tests/test_filetools error bogus ( see https://bugzilla.redhat.com/723938 )
>@@ -131,12 +168,4 @@
> 
> %files -f %{name}.lang
> %doc README{,.*} ANNOUNCE RELEASE-NOTES
>-%{_bindir}/%{name}
>-%{_bindir}/lyxclient
>-%{_bindir}/tex2lyx
>-%{_datadir}/%{name}
>-%{_datadir}/applications/%{name}.desktop
>-%{_datadir}/texmf/tex/latex/%{name}
>-%{_sysconfdir}/bash_completion.d/%{name}
>-%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
>-%{_iconsdir}/hicolor/48x48/apps/%{name}.png
>+

Index: SPECS/lyx.spec
===================================================================
--- SPECS/lyx.spec	(revisiÃ³n: 2004882)
+++ SPECS/lyx.spec	(copia de trabajo)
@@ -1,16 +1,25 @@
 %define lyxver  %(echo %{version} | cut -d. -f1,2)
 
 Name:           lyx
-Version:        2.3.6.1
-Release:        %mkrel 2
+Version:        2.3.7
+Release:        %mkrel 1
 Summary:        A word processor for the Desktop Environment
 Group:          Office/Word processor
 License:        GPLv2+
 URL:            https://www.lyx.org/
-Source0:        https://ftp.lip6.fr/pub/lyx/stable/%{lyxver}.x/%{name}-%{version}.tar.xz
-Patch0:         lyx-2.3.6-python3.patch
-Patch1:         lyx-2.3.6.1-build-with-GCC12.patch
+Source0:        https://ftp.lip6.fr/pub/lyx/stable/%{lyxver}.x/%{name}-%{version}-1.tar.xz
 
+## upstreamable patches
+# already part of 2.4.x source and fixes
+# https://bugzilla.redhat.com/show_bug.cgi?id=1965118
+Patch0:  lyx-2.3.6-layout2layout.patch
+
+Patch1:         lyx-2.3.6-python3.patch
+#From debian
+#http://lists.lyx.org/pipermail/lyx-devel/2022-February.txt
+Patch2: 		lyx-Fix-GuiView.patch
+Patch3:         lyx-2.3.7-build-with-GCC12.patch
+
 BuildRequires:  bc
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -50,6 +59,16 @@
 Requires:       texlive-dist
 Requires:       xdg-utils
 
+#Equivalent to suse recommends
+Recommends:		biber
+Recommends:		texlive-doc
+
+# Some stuff needed for LyX's documentation:
+Recommends:     texlive-collection-basic
+Recommends:		texlive-fontsextra
+
+#End of stuff recommended in suse
+
 %description
 LyX is a modern approach of writing documents with a computer which breaks
 with the tradition of the obsolete typewriter concept.  It is designed for
@@ -62,6 +81,13 @@
 %prep
 %autosetup -p1
 
+
+# prefer xdg-open over alternatives in configuration
+for prog in xv firefox kghostview pdfview xdvi
+do
+    sed -i -e "s/'$prog'/'xdg-open', '$prog'/" lib/configure.py
+done
+
 # Switch to enchant2
 sed -i -e '/ENCHANT_LIBRARY/s,"enchant","enchant-2",g' \
   -e 's,/usr/include/enchant,%{_includedir}/enchant-2,g' \
@@ -88,8 +114,6 @@
 mkdir -p %{buildroot}${TEXMF}/tex/latex
 mv %{buildroot}%{_datadir}/%{name}/tex %{buildroot}${TEXMF}/tex/latex/%{name}
 
-%find_lang %{name}
-
 # icon
 install -p -D -m644 lib/images/lyx.png \
   %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.png
@@ -106,6 +130,13 @@
 mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
 rm -rf %{buildroot}%{_datadir}/lyx/fonts
 
+#Missing Stuff
+pushd lib/doc
+for doc in $(find *  -type f); do
+	install -Dm0644 $doc %{buildroot}%{_datadir}/lyx/doc/$doc
+done
+popd
+
 ## Now configure LyX
 pushd %{buildroot}%{_datadir}/%{name}
 %{__python3} configure.py > /dev/null
@@ -116,6 +147,12 @@
 # bash completion
 install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
 
+# appdata
+install -p -D lib/appdata.xml %{buildroot}%{_metainfodir}/lyx.appdata.xml
+
+#List of files
+find %{buildroot}/* -type f|sed -e 's|%{buildroot}||g' > %{name}.lang
+
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 # tests/test_filetools error bogus ( see https://bugzilla.redhat.com/723938 )
@@ -131,12 +168,4 @@
 
 %files -f %{name}.lang
 %doc README{,.*} ANNOUNCE RELEASE-NOTES
-%{_bindir}/%{name}
-%{_bindir}/lyxclient
-%{_bindir}/tex2lyx
-%{_datadir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/texmf/tex/latex/%{name}
-%{_sysconfdir}/bash_completion.d/%{name}
-%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
-%{_iconsdir}/hicolor/48x48/apps/%{name}.png
+

Actions: View | Diff

Attachments on bug 28938: 12715 | 12716 | 13976 | 13977 | 13978 | 13979 | 13980 | 13981 | 13982 | 14139 | 14140 | 14193