Login
Log in using an SSO provider:
Fedora Account System
Red Hat Associate
Red Hat Customer
Login using a Red Hat Bugzilla account
Forgot Password
Create an Account
Red Hat Bugzilla – Attachment 1981639 Details for
Bug 2228918
Review Request: jedit - Programmer's text editor
Home
New
Search
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh89 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
[?]
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
The .spec file difference from Copr build 6238651 to 6241063
spec-from-6238651-to-6241063.diff (text/plain), 4.44 KB, created by
Fedora Review Service
on 2023-08-04 14:18:25 UTC
(
hide
)
Description:
The .spec file difference from Copr build 6238651 to 6241063
Filename:
MIME Type:
Creator:
Fedora Review Service
Created:
2023-08-04 14:18:25 UTC
Size:
4.44 KB
patch
obsolete
>--- https://copr.fedorainfracloud.org/coprs/build/6238651 >+++ https://copr.fedorainfracloud.org/coprs/build/6241063 >@@ -3,12 +3,13 @@ > Release: 1%{?dist} > Summary: Programmer's text editor > >-License: GPL-2.0-or-later >+License: GPL-2.0-or-later AND GFDL-1.1-no-invariants-or-later > URL: http://www.jedit.org/ > Source0: https://sourceforge.net/projects/jedit/files/jedit/%{version}/jedit%{version}source.tar.bz2 > >-BuildRequires: ant apache-ivy ant-junit ivy-local junit bsf bsh ant-contrib ant-apache-bsf mockito hamcrest jsr-305 desktop-file-utils >+BuildRequires: ant apache-ivy ant-junit ivy-local junit bsf bsh ant-contrib ant-apache-bsf mockito hamcrest jsr-305 desktop-file-utils docbook-style-xsl xerces-j2 xalan-j2 > Requires: java >= 1:11 >+Requires: javapackages-filesystem > Requires: which > > BuildArch: noarch >@@ -27,10 +28,8 @@ > %setup -q -n jEdit > > # remove unnecessary dependencies (not required for default build) >-sed -i '/<dependency org="saxon"/d' ivy.xml > sed -i '/<dependency org="net.sf.docbook" name="docbook-xsl"/,/<\/dependency>/d' ivy.xml > sed -i '/<dependency org="net.sf.docbook" name="docbook-xsl-saxon"/d' ivy.xml >-sed -i '/<dependency org="xerces" name="xercesImpl"/d' ivy.xml > sed -i '/<dependency org="org.apache.xmlgraphics" name="fop"/d' ivy.xml > sed -i '/<dependency org="net.sf.launch4j" name="launch4j"/,/<\/dependency>/d' ivy.xml > sed -i '/<dependency org="org.bouncycastle"/d' ivy.xml >@@ -42,40 +41,47 @@ > # skip downloading of binary plugins > sed -i '/<dependency org="org.jedit.plugins"/d' ivy.xml > sed -i '/<script language="javascript">/,/<[/]script>/d' build.xml >-sed -i 's;<ivy:retrieve.*/>;&\n<mkdir dir="${lib.dir}/default-plugins"/>;g' build.xml >+sed -i 's;<ivy:retrieve.*/>;&\n<mkdir dir="${lib.dir}/default-plugins"/>;g' build.xml >+ >+# fix docs generation >+# docbook-xsl not available as xmvn artifact in fedora, supply zip manually >+ln -s /usr/share/sgml/docbook/xsl-stylesheets docbook >+zip -rq docbook-xsl-resources.zip docbook >+sed -i 's;${lib.dir}/docbook/docbook-xsl-resources.zip;docbook-xsl-resources.zip;g' build.xml >+# saxon not available in fedora, use xalan instead >+sed -i 's;org="saxon" name="saxon" rev="[0-9.]*";org="xalan" name="xalan" rev="2.7.2";g' ivy.xml >+sed -i 's;com.icl.saxon.TransformerFactoryImpl;org.apache.xalan.processor.TransformerFactoryImpl;g' build.xml > > # use system ivy configuration > rm -f ivysettings.xml > sed -i '/<ivy:settings.*[/]>/d' build.xml > > %build >-ant -Divy.mode=local -Divy.jar.present=true build >+ant -Divy.mode=local -Divy.jar.present=true build docs-html > > %install >-mkdir -p %{buildroot}%{_javadir}/%{name} >-cp -pR build/{%{name}.jar,keymaps,macros,modes,properties,startup,jars} %{buildroot}%{_javadir}/%{name} >+mkdir -p %{buildroot}%{_javadir} >+cp -pR build/%{name}.jar %{buildroot}%{_javadir}/ > >-# basic docs, without generated part (which needs deps unavailable in fedora atm) >-# rest can be found online on project's site: http://www.jedit.org/index.php?page=docs >-cp -pR doc %{buildroot}%{_javadir}/%{name} >-find %{buildroot}%{_javadir}/%{name}/doc -name '*.xml' -delete >-find %{buildroot}%{_javadir}/%{name}/doc -name '*.xsl' -delete >+mkdir -p %{buildroot}%{_datadir}/%{name} >+cp -pR build/{doc,jars,keymaps,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name} >+ln -s ../java/%{name}.jar %{buildroot}%{_datadir}/%{name}/%{name}.jar > > mkdir -p %{buildroot}%{_bindir} > cp -p package-files/linux/jedit %{buildroot}%{_bindir}/jedit >-sed -i 's;/usr/share/jEdit/@jar.filename@;%{_javadir}/%{name}/%{name}.jar;g' %{buildroot}%{_bindir}/jedit >+sed -i 's;/usr/share/jEdit/@jar.filename@;%{_datadir}/%{name}/%{name}.jar;g' %{buildroot}%{_bindir}/jedit > chmod +x %{buildroot}%{_bindir}/jedit > >-mkdir -p %{buildroot}%{_mandir}/man1 >+mkdir -p %{buildroot}%{_mandir}/man1 > cp -p package-files/linux/jedit.1 %{buildroot}%{_mandir}/man1/jedit.1 > sed -i 's;@jedit.version@;%{version};g' %{buildroot}%{_mandir}/man1/jedit.1 > > mkdir -p %{buildroot}%{_datadir}/applications >-desktop-file-install --dir=%{buildroot}%{_datadir}/applications --set-icon=%{_javadir}/%{name}/doc/%{name}.png package-files/linux/deb/%{name}.desktop >+desktop-file-install --dir=%{buildroot}%{_datadir}/applications --set-icon=%{_datadir}/%{name}/doc/%{name}.png package-files/linux/deb/%{name}.desktop > > %files >-%dir %{_javadir}/%{name} >-%{_javadir}/%{name}/** >+%{_javadir}/%{name}.jar >+%{_datadir}/%{name} > %{_bindir}/%{name} > %{_mandir}/man1/jedit.1* > %{_datadir}/applications/jedit.desktop
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 2228918
:
1981507
| 1981639