Re: make rpmdist failing

2023-07-26 Thread Richard Kimberly Heck

On 7/26/23 18:46, Pavel Sanda wrote:

On Mon, Jul 24, 2023 at 07:51:07PM -0400, Richard Kimberly Heck wrote:

Documentation in lyx.rpm.README mentions qt4 + i386, I'm not sure how
much is our rpm-build being used during recent years...

Yes, that seems to fix it. It's using Qt5, as far as I can see.

It's now in.


Thanks!

Riki


--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: make rpmdist failing

2023-07-26 Thread Pavel Sanda
On Mon, Jul 24, 2023 at 07:51:07PM -0400, Richard Kimberly Heck wrote:
> >Documentation in lyx.rpm.README mentions qt4 + i386, I'm not sure how
> >much is our rpm-build being used during recent years...
> 
> Yes, that seems to fix it. It's using Qt5, as far as I can see.

It's now in. Pavel
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: make rpmdist failing

2023-07-25 Thread Scott Kostyshak
On Mon, Jul 24, 2023 at 07:51:07PM -0400, Richard Kimberly Heck wrote:
> On 7/24/23 05:52, Pavel Sanda wrote:
> > On Sun, Jul 23, 2023 at 08:19:29PM -0400, Richard Kimberly Heck wrote:
> > > RPM build errors:
> > >      Installed (but unpackaged) file(s) found:
> > >     /usr/share/metainfo/org.lyx.LyX.metainfo.xml
> > > 
> > Does this patch help?
> > 
> > Documentation in lyx.rpm.README mentions qt4 + i386, I'm not sure how
> > much is our rpm-build being used during recent years...
> 
> Yes, that seems to fix it. It's using Qt5, as far as I can see.
> 
> Scott suggested a while back I do this instead of installing directly, the
> thought being that constantly over-writing my installation with new updates
> could lead to problems, or at least to stray files that never get removed.

Indeed, I think I learned that from Kornel. I can install with a .deb and that 
way it is easy to uninstall. Perhaps checkinstall is an alternative, but I 
never tried it.

Scott


signature.asc
Description: PGP signature
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: make rpmdist failing

2023-07-24 Thread Richard Kimberly Heck

On 7/24/23 05:52, Pavel Sanda wrote:

On Sun, Jul 23, 2023 at 08:19:29PM -0400, Richard Kimberly Heck wrote:

RPM build errors:
     Installed (but unpackaged) file(s) found:
    /usr/share/metainfo/org.lyx.LyX.metainfo.xml


Does this patch help?

Documentation in lyx.rpm.README mentions qt4 + i386, I'm not sure how
much is our rpm-build being used during recent years...


Yes, that seems to fix it. It's using Qt5, as far as I can see.

Scott suggested a while back I do this instead of installing directly, 
the thought being that constantly over-writing my installation with new 
updates could lead to problems, or at least to stray files that never 
get removed.


Riki


--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: make rpmdist failing

2023-07-24 Thread José Matos
On Mon, 2023-07-24 at 11:52 +0200, Pavel Sanda wrote:
> Does this patch help?

I would expect this to fix the issue.

> Documentation in lyx.rpm.README mentions qt4 + i386, I'm not sure how
> much is our rpm-build being used during recent years...

I have dabbled about this before. :-)
The issue is that the rpm spec is dependent on the distribution being
used.

> Pavel

-- 
José Abílio
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: make rpmdist failing

2023-07-24 Thread Pavel Sanda
On Sun, Jul 23, 2023 at 08:19:29PM -0400, Richard Kimberly Heck wrote:
> RPM build errors:
>     Installed (but unpackaged) file(s) found:
>    /usr/share/metainfo/org.lyx.LyX.metainfo.xml
> 

Does this patch help?

Documentation in lyx.rpm.README mentions qt4 + i386, I'm not sure how
much is our rpm-build being used during recent years...

Pavel
diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index b5333b27a8..9ee9555bcf 100644
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -90,3 +90,4 @@ texhash
 %{_datadir}/texmf/tex/latex/%{name}
 %{_datadir}/icons/*
 %{_datadir}/applications/*
+%{_datadir}/metainfo/*
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: make rpmdist failing

2023-07-23 Thread Richard Kimberly Heck

On 7/22/23 20:10, José Matos wrote:

On Sat, 2023-07-22 at 23:59 +0200, Jean-Marc Lasgouttes wrote:

I suspect rpmdist dislikes the hyphens after RC1. Are you sure that
this is typical of rpm naming? You could try underscores instead.

In the past our release nme were more like lyx-2.4.0rc1

Jean-Marc is right regarding the name scheme:

[name]-[version]-[release].[arch].rpm

2.4.0-RC1-devel

does not work but

2.4.0-RC1.devel

would

where 2.4.0 is the version and RC1-devel is the release.


Notice also that nowadays rpm supports the pre-release naming scheme
like

2.4.0~rc1 for the version.

This is only relevant if you plan to later release

lyx-2.4.0-1

to ensure that rpm considers that this version is newer than

lyx-2.4.0~rc1-1 (for example)


OK, after changing the version in configure.ac to 2.4.0~RC1.1, I get 
further. But then I get:


RPM build errors:
    Installed (but unpackaged) file(s) found:
   /usr/share/metainfo/org.lyx.LyX.metainfo.xml

Any idea what that is?

Full rpm-related output below.

Riki



+ TEXMF=/usr/share/texmf
+ mkdir -p 
/home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/share/texmf/tex/

latex
+ mv 
/home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/share/lyx/tex 
/home/ri
kiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64//usr/share/texmf/tex/latex/lyx 

+ cp -a lib/images/lyx.png 
/home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/

share/lyx/images/
+ /usr/bin/find-debuginfo -j16 --strict-build-id -m -i --build-id-seed 
2.4.0~RC1.1-2 --uni
que-debug-suffix -2.4.0~RC1.1-2.x86_64 --unique-debug-src-base 
lyx-2.4.0~RC1.1-2.x86_64 --
run-dwz --dwz-low-mem-die-limit 1000 --dwz-max-die-limit 11000 
-S debugsourcefiles

.list /home/rikiheck/rpmbuild/BUILD/lyx-2.4.0~RC1.1
extracting debug info from 
/home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/

bin/lyx
extracting debug info from 
/home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/

bin/lyxclient
extracting debug info from 
/home/rikiheck/rpmbuild/BUILDROOT/lyx-2.4.0~RC1.1-2.x86_64/usr/

bin/tex2lyx
/usr/bin/gdb
/usr/bin/gdb
/tmp/tmp.OR6YbGHPBg (1/1)
 100 %   4136 B / 21.3 KiB = 0.190
/tmp/tmp.MOjAyU9Hxr (1/1)
 100 %    23.5 KiB / 187.6 KiB = 0.125
/usr/bin/gdb
/tmp/tmp.LMb3FJ2a5s (1/1)
 100 %  130.1 KiB / 1016.2 KiB = 0.128
original debug info size: 279980kB, size after compression: 232736kB
/usr/bin/sepdebugcrcfix: Updated 3 CRC32s, 0 CRC32s did match.
19714 blocks
+ /usr/lib/rpm/check-buildroot
+ /usr/lib/rpm/redhat/brp-ldconfig
+ /usr/lib/rpm/brp-compress
+ /usr/lib/rpm/redhat/brp-strip-lto /usr/bin/strip
+ /usr/lib/rpm/brp-strip-static-archive /usr/bin/strip
+ /usr/lib/rpm/check-rpaths
+ /usr/lib/rpm/redhat/brp-mangle-shebangs
*** WARNING: ./usr/share/lyx/scripts/csv2lyx.py is executable but has no 
shebang, removing

executable bit
*** WARNING: ./usr/share/lyx/scripts/fen2ascii.py is executable but has 
no shebang, removi

ng executable bit
*** WARNING: ./usr/share/lyx/scripts/prefs2prefs_prefs.py is executable 
but has no shebang

, removing executable bit
*** WARNING: ./usr/share/lyx/scripts/fig2pdftex.py is executable but has 
no shebang, remov

ing executable bit
*** WARNING: ./usr/share/lyx/scripts/lyxpak.py is executable but has no 
shebang, removing

executable bit
*** WARNING: ./usr/share/lyx/scripts/convertDefault.py is executable but 
has no shebang, r

emoving executable bit
*** WARNING: ./usr/share/lyx/scripts/clean_dvi.py is executable but has 
no shebang, removi

ng executable bit
*** WARNING: ./usr/share/lyx/scripts/legacy_lyxpreview2ppm.py is 
executable but has no she

bang, removing executable bit
*** WARNING: ./usr/share/lyx/scripts/fig2pstex.py is executable but has 
no shebang, removi

ng executable bit
*** WARNING: ./usr/share/lyx/scripts/lyxpreview2bitmap.py is executable 
but has no shebang

, removing executable bit
*** WARNING: ./usr/share/lyx/scripts/lyxpreview_tools.py is executable 
but has no shebang,

removing executable bit
*** WARNING: ./usr/share/lyx/scripts/docbook_copy.py is executable but 
has no shebang, rem

oving executable bit
*** WARNING: ./usr/share/lyx/scripts/prefs2prefs.py is executable but 
has no shebang, remo

ving executable bit
*** WARNING: ./usr/share/lyx/scripts/TeXFiles.py is executable but has 
no shebang, removin

g executable bit
*** WARNING: ./usr/share/lyx/scripts/include_bib.py is executable but 
has no shebang, remo

ving executable bit
*** WARNING: ./usr/share/lyx/scripts/ext_copy.py is executable but has 
no shebang, removin

g executable bit
*** WARNING: ./usr/share/lyx/scripts/html2latexwrapper.py is executable 
but has no shebang

, removing executable bit
*** WARNING: ./usr/share/lyx/scripts/convert_pdf.py is executable but 
has no shebang, remo

ving executable bit
*** WARNING: ./usr/share/lyx/scripts/docbook2epub.py is executable but 
has no shebang, rem

oving executable bit
*** WARNING: ./usr/share/lyx/scripts/layout2layout.py is executable but 
has no shebang, 

Re: make rpmdist failing

2023-07-22 Thread José Matos
On Sat, 2023-07-22 at 23:59 +0200, Jean-Marc Lasgouttes wrote:
> I suspect rpmdist dislikes the hyphens after RC1. Are you sure that
> this is typical of rpm naming? You could try underscores instead.
> 
> In the past our release nme were more like lyx-2.4.0rc1

Jean-Marc is right regarding the name scheme:

[name]-[version]-[release].[arch].rpm

2.4.0-RC1-devel

does not work but

2.4.0-RC1.devel

would

where 2.4.0 is the version and RC1-devel is the release.


Notice also that nowadays rpm supports the pre-release naming scheme
like

2.4.0~rc1 for the version.

This is only relevant if you plan to later release

lyx-2.4.0-1

to ensure that rpm considers that this version is newer than

lyx-2.4.0~rc1-1 (for example)

Best regards,
-- 
José Abílio
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: make rpmdist failing

2023-07-22 Thread Jean-Marc Lasgouttes

Le 22/07/2023 à 21:05, Richard Kimberly Heck a écrit :
I've finally decided to use the rpmdist target rather than installing 
directly, but it is failing here:


     $(LN_S) $(srcdir)/lib/images/lyx.png . ; \

The problem is that LN_S does not seem to be defined, so it is trying to 
execute the image.


Try to add AC_PROG_LN_S somewhere in configure.ac



$RPMBUILD -ta lyx-2.4.0-RC1-devel.tar.gz ; saved_status=$?; \
rm lyx.png; exit $saved_status
error: line 5: Illegal char '-' (0x2d) in: Version: 2.4.0-RC1-devel


I suspect rpmdist dislikes the hyphens after RC1. Are you sure that this 
is typical of rpm naming? You could try underscores instead.


In the past our release nme were more like lyx-2.4.0rc1

JMarc
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: make rpmdist failing

2023-07-22 Thread Kornel Benko
Am Sat, 22 Jul 2023 15:05:11 -0400
schrieb Richard Kimberly Heck :

> I've finally decided to use the rpmdist target rather than installing 
> directly, but it is failing here:
> 
>      $(LN_S) $(srcdir)/lib/images/lyx.png . ; \
> 
> The problem is that LN_S does not seem to be defined, so it is trying to 
> execute the image.
> 
> Temporarily replacing that with cp leads to:
> 
> rpm: -ta: unknown option
> 
> I needed to install the rpm-build package, but shouldn't this adapt? or 
> warn me?
> 
> Next problem:
> 
> $RPMBUILD -ta lyx-2.4.0-RC1-devel.tar.gz ; saved_status=$?; \
> rm lyx.png; exit $saved_status
> error: line 5: Illegal char '-' (0x2d) in: Version: 2.4.0-RC1-devel
> 
> This seems to be in the lyx.spec file, not in the filename itself.
> 
> Finally, does a similar target exist for cmake? If so, how to call it?

Not yet.
But in cmake it would be something like
   set(RPM_VERSION_SUFFIX whatever_that_may_be)
   set(PACKAGE whatever_that_may_be)
   set(VERSION whatever_that_may_be)
   set(DESTINATION whatever_that_may_be)
   configure_file("${TOP_SRC_DIR}/development/lyx.spec.in"
   "${DESTINATION}/lyx${PROGRAM_SUFFIX}.spec")

OTOH, why would we need it in cmake? We create already the rpm-package there.

> Riki

Kornel



pgpfjZBBA5kEz.pgp
Description: Digitale Signatur von OpenPGP
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


make rpmdist failing

2023-07-22 Thread Richard Kimberly Heck
I've finally decided to use the rpmdist target rather than installing 
directly, but it is failing here:


    $(LN_S) $(srcdir)/lib/images/lyx.png . ; \

The problem is that LN_S does not seem to be defined, so it is trying to 
execute the image.


Temporarily replacing that with cp leads to:

rpm: -ta: unknown option

I needed to install the rpm-build package, but shouldn't this adapt? or 
warn me?


Next problem:

$RPMBUILD -ta lyx-2.4.0-RC1-devel.tar.gz ; saved_status=$?; \
rm lyx.png; exit $saved_status
error: line 5: Illegal char '-' (0x2d) in: Version: 2.4.0-RC1-devel

This seems to be in the lyx.spec file, not in the filename itself.

Finally, does a similar target exist for cmake? If so, how to call it?

Riki
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: CVS lyx: make rpmdist failing

2004-10-22 Thread Georg Baum
Kayvan A. Sylvan wrote:

 Have you tried it with an empty body? My RPM complains about the
 empty body and it never gets substituted.

I thought I had tried it, but obviously did not. The attached patch works
for me. Can you please test wether it works for you too?


Georg--- lyx-1.4-cvs/config/lyxinclude.m4	2004-10-12 10:46:18.0 +0200
+++ lyx-1.4-cvs-rpm-test/config/lyxinclude.m4	2004-10-22 12:37:03.0 +0200
@@ -29,6 +29,7 @@
 dnl
 AC_DEFUN([LYX_VERSION_SUFFIX],[
 AC_MSG_CHECKING([for install target ... ])
+RPM_VERSION_SUFFIX=''
 AC_ARG_WITH(version-suffix,
   [  --with-version-suffix[=version]  install lyx files as lyxversion],
   [if test x$withval = xyes;


Re: CVS lyx: make rpmdist failing

2004-10-22 Thread Georg Baum
Kayvan A. Sylvan wrote:

> Have you tried it with an empty body? My RPM complains about the
> empty body and it never gets substituted.

I thought I had tried it, but obviously did not. The attached patch works
for me. Can you please test wether it works for you too?


Georg--- lyx-1.4-cvs/config/lyxinclude.m4	2004-10-12 10:46:18.0 +0200
+++ lyx-1.4-cvs-rpm-test/config/lyxinclude.m4	2004-10-22 12:37:03.0 +0200
@@ -29,6 +29,7 @@
 dnl
 AC_DEFUN([LYX_VERSION_SUFFIX],[
 AC_MSG_CHECKING([for install target ... ])
+RPM_VERSION_SUFFIX='""'
 AC_ARG_WITH(version-suffix,
   [  --with-version-suffix[=]  install lyx files as lyx],
   [if test "x$withval" = "xyes";


CVS lyx: make rpmdist failing

2004-10-21 Thread Kayvan A. Sylvan
Did something change recently with the RPM spec file or the build process?

+ ./configure --with-frontend=xforms --prefix=/usr --mandir=/usr/share/man --bin
dir=/usr/bin --datadir=/usr/share --without-warnings --disable-debug --enable-op
timization=-O2 %{version_suffix}
configure: WARNING: you should use --build, --host, --target
configure: WARNING: invalid host type: %{version_suffix}
configuring LyX version 1.4.0cvs
WARNING: This is a development version. Expect bugs.
checking whether to enable maintainer-specific portions of Makefiles... yes
checking build system type... Invalid configuration `%{version_suffix}': machine
 `%{version_suffix}' not recognized
configure: error: /bin/sh config/config.sub %{version_suffix} failed



-- 
Kayvan A. Sylvan  | Proud husband of   | Father to my kids:
Sylvan Associates, Inc.   | Laura Isabella Sylvan  | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | crown of her husband | Robin Gregory (2/28/92)


Re: CVS lyx: make rpmdist failing

2004-10-21 Thread Georg Baum
Am Donnerstag, 21. Oktober 2004 19:46 schrieb Kayvan A. Sylvan:
 Did something change recently with the RPM spec file or the build 
process?

Yes. I made rpms with version suffix work (at on my machine).

 + ./configure --with-frontend=xforms --prefix=/usr 
--mandir=/usr/share/man --bin
 dir=/usr/bin --datadir=/usr/share --without-warnings --disable-debug 
--enable-op
 timization=-O2 %{version_suffix}

Why is that %{version_suffix}? This should be an empty variable or a 
string like --with-version-suffix=1.4

It is set in the second line of the spec file. How does it look like?


Georg



Re: CVS lyx: make rpmdist failing

2004-10-21 Thread Kayvan A. Sylvan
On Thu, Oct 21, 2004 at 08:47:22PM +0200, Georg Baum wrote:
 Am Donnerstag, 21. Oktober 2004 19:46 schrieb Kayvan A. Sylvan:
  Did something change recently with the RPM spec file or the build 
 process?
 
 Yes. I made rpms with version suffix work (at on my machine).
 
  + ./configure --with-frontend=xforms --prefix=/usr 
 --mandir=/usr/share/man --bin
  dir=/usr/bin --datadir=/usr/share --without-warnings --disable-debug 
 --enable-op
  timization=-O2 %{version_suffix}
 
 Why is that %{version_suffix}? This should be an empty variable or a 
 string like --with-version-suffix=1.4

Have you tried it with an empty body? My RPM complains about the
empty body and it never gets substituted.

-- 
Kayvan A. Sylvan  | Proud husband of   | Father to my kids:
Sylvan Associates, Inc.   | Laura Isabella Sylvan  | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | crown of her husband | Robin Gregory (2/28/92)


CVS lyx: make rpmdist failing

2004-10-21 Thread Kayvan A. Sylvan
Did something change recently with the RPM spec file or the build process?

+ ./configure --with-frontend=xforms --prefix=/usr --mandir=/usr/share/man --bin
dir=/usr/bin --datadir=/usr/share --without-warnings --disable-debug --enable-op
timization=-O2 %{version_suffix}
configure: WARNING: you should use --build, --host, --target
configure: WARNING: invalid host type: %{version_suffix}
configuring LyX version 1.4.0cvs
WARNING: This is a development version. Expect bugs.
checking whether to enable maintainer-specific portions of Makefiles... yes
checking build system type... Invalid configuration `%{version_suffix}': machine
 `%{version_suffix}' not recognized
configure: error: /bin/sh config/config.sub %{version_suffix} failed



-- 
Kayvan A. Sylvan  | Proud husband of   | Father to my kids:
Sylvan Associates, Inc.   | Laura Isabella Sylvan  | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)


Re: CVS lyx: make rpmdist failing

2004-10-21 Thread Georg Baum
Am Donnerstag, 21. Oktober 2004 19:46 schrieb Kayvan A. Sylvan:
> Did something change recently with the RPM spec file or the build 
process?

Yes. I made rpms with version suffix work (at on my machine).

> + ./configure --with-frontend=xforms --prefix=/usr 
--mandir=/usr/share/man --bin
> dir=/usr/bin --datadir=/usr/share --without-warnings --disable-debug 
--enable-op
> timization=-O2 %{version_suffix}

Why is that %{version_suffix}? This should be an empty variable or a 
string like "--with-version-suffix=1.4"

It is set in the second line of the spec file. How does it look like?


Georg



Re: CVS lyx: make rpmdist failing

2004-10-21 Thread Kayvan A. Sylvan
On Thu, Oct 21, 2004 at 08:47:22PM +0200, Georg Baum wrote:
> Am Donnerstag, 21. Oktober 2004 19:46 schrieb Kayvan A. Sylvan:
> > Did something change recently with the RPM spec file or the build 
> process?
> 
> Yes. I made rpms with version suffix work (at on my machine).
> 
> > + ./configure --with-frontend=xforms --prefix=/usr 
> --mandir=/usr/share/man --bin
> > dir=/usr/bin --datadir=/usr/share --without-warnings --disable-debug 
> --enable-op
> > timization=-O2 %{version_suffix}
> 
> Why is that %{version_suffix}? This should be an empty variable or a 
> string like "--with-version-suffix=1.4"

Have you tried it with an empty body? My RPM complains about the
empty body and it never gets substituted.

-- 
Kayvan A. Sylvan  | Proud husband of   | Father to my kids:
Sylvan Associates, Inc.   | Laura Isabella Sylvan  | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)