#1 Rpath problem fix
Closed 5 months ago by troycurtisjr. Opened 5 months ago by iago.
https://github.com/iagorubio/rarian-rpm.git main  into  rawhide

Update rarian.spec
Iago Rubio • 5 months ago  
Changed autotools rpath fix for seding libtool fix
iagorubio • 5 months ago  
Changes in configure to try to fix rpath
iagorubio • 5 months ago  
Removed source tarball and corrected spec
iagorubio • 5 months ago  
Added missin scrollkeeper dtd
iagorubio • 5 months ago  
Updated Readme
iagorubio • 5 months ago  
Updated Readme
iagorubio • 5 months ago  
README.md
file modified
+19
@@ -1,1 +1,20 @@

  # rarian-rpm

+ 

+ This project aims to provide patches and specs for a rpm build of librarian

+ 

+ Full source of librarian is at https://rarian.freedesktop.org/Releases/rarian-0.8.1.tar.bz2

+ 

+ Rarian Website https://rarian.freedesktop.org/

+ 

+ To build the rpm copy the tar file and patches to your rpmbuild sorces dir, usually:

+ 

+ **~/rpmbuild/SOURCES**

+ 

+ Use the command *rpmbuild -ba rarian.spec* to build the rpm.

+ 

+ The resulting rpm will be at your rpmbuild RPM directory and the source rpms at the SRPMS

+ directory, usually:

+ 

+ **~/rpmbuild/RPMS**

+ **~/rpmbuild/SRPMS**

+ 

rarian-0.8.1.tar.bz2
file removed

rarian-autotools-fix.patch
file removed
-54
@@ -1,54 +0,0 @@

- diff -X excludes -ruN rarian-0.8.1/configure.ac rarian-0.8.1.new/configure.ac

- --- rarian-0.8.1/configure.ac	2008-09-01 20:44:05.000000000 +0200

- +++ rarian-0.8.1.new/configure.ac	2021-08-19 22:19:06.107194924 +0200

- @@ -5,7 +5,9 @@

-  AC_INIT(rarian, 0.8.1)

-  AC_CONFIG_SRCDIR([util/rarian-example.c])

-  AC_CONFIG_HEADER([config.h])

- -AM_INIT_AUTOMAKE ([foreign dist-bzip2 dist-gzip])

- +AM_INIT_AUTOMAKE ([subdir-objects foreign dist-bzip2 dist-gzip])

- +

- +AC_CONFIG_MACRO_DIR([m4])

-  

-  AM_MAINTAINER_MODE

-  

- diff -X excludes -ruN rarian-0.8.1/librarian/Makefile.am rarian-0.8.1.new/librarian/Makefile.am

- --- rarian-0.8.1/librarian/Makefile.am	2008-09-01 20:40:21.000000000 +0200

- +++ rarian-0.8.1.new/librarian/Makefile.am	2021-08-19 22:12:08.285205342 +0200

- @@ -1,3 +1,5 @@

- +AUTOMAKE_OPTIONS = subdir-objects

- +

-  pkginclude_HEADERS = rarian.h rarian-main.h rarian-reg-utils.h \

-  		rarian-info.h rarian-man.h

-  lib_LTLIBRARIES = librarian.la

- @@ -30,4 +32,4 @@

-  endif

-  

-  librarian_la_CFLAGS = -DDATADIR=\""$(datadir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DI_KNOW_RARIAN_0_8_IS_UNSTABLE

- -librarian_la_LDFLAGS = -export-symbols-regex "^rrn_.*"

- \ No newline at end of file

- +librarian_la_LDFLAGS = -export-symbols-regex "^rrn_.*"

- diff -X excludes -ruN rarian-0.8.1/Makefile.am rarian-0.8.1.new/Makefile.am

- --- rarian-0.8.1/Makefile.am	2008-09-01 20:40:21.000000000 +0200

- +++ rarian-0.8.1.new/Makefile.am	2021-08-20 10:46:12.948438153 +0200

- @@ -5,4 +5,7 @@

-  pkgconfigdir = $(libdir)/pkgconfig

-  pkgconfig_DATA = rarian.pc

-  

- -SUBDIRS = librarian util data docs

- \ No newline at end of file

- +ACLOCAL_AMFLAGS=-I m4

- +

- +SUBDIRS = librarian util data docs

- +

- diff -X excludes -ruN rarian-0.8.1/util/Makefile.am rarian-0.8.1.new/util/Makefile.am

- --- rarian-0.8.1/util/Makefile.am	2008-09-01 20:40:21.000000000 +0200

- +++ rarian-0.8.1.new/util/Makefile.am	2021-08-19 22:15:30.481168150 +0200

- @@ -1,4 +1,6 @@

- -INCLUDES =      \

- +AUTOMAKE_OPTIONS = subdir-objects

- +

- +AM_CPPFLAGS =      \

-      -I$(srcdir)/../librarian

-  LDADD =         \

-      ../librarian/librarian.la

rarian.spec
file modified
+13 -11
@@ -1,28 +1,26 @@

- 

  Name: rarian

  Version: 0.8.1

  Release: 28%{?dist}

  License: LGPLv2+

  Summary: Documentation meta-data library

  URL: http://rarian.freedesktop.org/

+ # Source: http://download.gnome.org/sources/rarian/0.8/rarian-%{version}.tar.bz2

+ # Upstream URL

  Source: https://rarian.freedesktop.org/Releases/rarian-%{version}.tar.bz2

  Source1: scrollkeeper-omf.dtd

  

  ### Patch ###

  

- # Autotools fix

- Patch0: rarian-autotools-fix.patch

- 

  # RH bug #453342

  Patch1: rarian-0.8.1-categories.patch

  

  ### Dependencies ###

  

- # Requires(post): libxml2

- # Requires(postun): libxml2

+ Requires(post): libxml2

+ Requires(postun): libxml2

  # for /usr/bin/xmlcatalog

  

- # Requires: libxslt

+ Requires: libxslt

  # for /usr/bin/xsltproc

  Requires: coreutils, util-linux, gawk

  # for basename, getopt, awk, etc
@@ -32,6 +30,7 @@

  BuildRequires: make

  BuildRequires: gcc-c++

  # BuildRequires: libxslt-devel

+ # libxlt-devel is not used on build

  

  %description

  Rarian is a documentation meta-data library that allows access to documents,
@@ -62,12 +61,12 @@

  

  %prep

  %setup -q

- libtoolize --copy --force &&  aclocal -I m4 &&  autoheader &&  automake --include-deps --add-missing --foreign &&  autoconf

- %patch0 -p1

  %patch1 -p1 -b .categories

  

  %build

- %configure --disable-skdb-update --disable-rpath

+ %configure --disable-skdb-update

+ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool

+ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

  %make_build

  

  %install
@@ -122,7 +121,10 @@

  

  %changelog

  * Fri Aug 20 2021 Yago Rubio Sanfiz <iagorubio@fedoraproject.org> - 0.8.1-28

- - Fixed autotools files to tackle with rpm rpath cheks

+ - Fixed rpath problem, removed some unused requires and changed Source url por upstream one.

+ 

+ * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-28

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

  

  * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-27

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

scrollkeeper-omf.dtd
file added
+223
@@ -0,0 +1,223 @@

+ <!-- 

+ Open Source Metadata Framework (OMF XML DTD) Version 1.1

+ 

+ Copyright (C) 1999, 2000  Kendall Grant Clark. All rights reserved.

+ 

+ $Id: scrollkeeper-omf.dtd,v 1.3 2002/04/20 03:56:48 muet Exp $

+ 

+ To use the OMF.dtd, an FPI like the following works:

+ 

+ "-//Open Source Metadata Framework (OMF) //DTD OMF.dtd V1.1//EN"

+ 

+ Permission to use, copy, modify and distribute the OMF DTD and its

+ accompanying documentation for any purpose and without fee is hereby

+ granted in perpetuity, provided that the above copyright notice and

+ this paragraph appear in all copies.  The copyright holders make no

+ representation about the suitability of the DTD for any purpose.  It

+ is provided "as is" without expressed or implied warranty. If you

+ modify the OMF DTD in any way, except for declaring and referencing

+ additional sets of general entities, declaring additional notations,

+ please label your DTD as a variant of OMF. This license requirement is

+ stated solely in the interests of maintaining data interchange

+ capability.

+      

+ Please direct all queries, comments, and suggestions about OMF to

+ Kendall Grant Clark, kclark@ntlug.org, or to Open Source Research

+ Team's mailing list:ldp-meta@franklin.oic.unc.edu 

+ 

+                                                                    -->

+ 

+ <!--

+ Scrollkeeper Open Source Metadata Framework (SK OMF XML DTD) Version 1.0

+ 

+ Copyright (C) 2002 Eric Baudais. All rights reserved.

+ 

+ To use the scrollkeeper.dtd, an FPI like the following works:

+ "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN"

+ 

+ Permission to use, copy, modify and distribute the OMF DTD and its

+ accompanying documentation for any purpose and without fee is hereby

+ granted in perpetuity, provided that the above copyright notice and

+ this paragraph appear in all copies.  The copyright holders make no

+ representation about the suitability of the DTD for any purpose.  It

+ is provided "as is" without expressed or implied warranty. If you

+ modify the Scrollkeeper OMF DTD in any way, except for declaring and 

+ referencing additional sets of general entities, declaring additional 

+ notations, please label your DTD as a variant of Scrollkeeper. This 

+ license requirement is stated solely in the interests of maintaining 

+ data interchange capability.

+                                                                    -->

+ 

+ <!-- ............................................................. -->

+ <!-- Entity Sets ................................................. -->

+ <!-- ............................................................. -->

+ 

+ <!ENTITY % licenseTypes PUBLIC

+ "-//Open Source Metadata Framework (OMF)//ENTITIES License Types//EN"

+ "licenseTypes.mod"                                                   >

+ <!-- %licenseTypes; -->

+ 

+ <!ENTITY % countryCodes PUBLIC

+ "-//Open Source Metadata Framework (OMF)//ENTITIES Country Codes//EN"

+ "countryCodes.mod"                                                   >

+ <!-- %countryCodes; -->

+ 

+ <!ENTITY % languageCodes PUBLIC

+ "-//Open Source Metadata Framework (OMF)//ENTITIES Language Codes//EN"

+ "languageCodes.mod"                                                  >

+ <!-- %languageCodes; -->

+ 

+ <!ENTITY % linuxDistributions PUBLIC

+ "-//Open Source Metadata Framework (OMF)//ENTITIES Linux Distributions//EN"

+ "linuxDistributions.mod"                                             >

+ <!-- %linuxDistributions; -->

+ 

+ <!-- ............................................................. -->

+ <!-- ............................................................. -->

+ 

+ <!-- ............................................................. -->

+ <!-- Internal Entities ........................................... -->

+ <!-- ............................................................. -->

+ <!ENTITY % base.attribute.set

+ "id        ID                                 #IMPLIED

+ modified   CDATA                              #IMPLIED

+ created    CDATA                              #IMPLIED"              >

+ 

+ <!ENTITY % core.attribute.set

+ "%base.attribute.set;

+ agent      CDATA                              #IMPLIED

+ status     CDATA                              #IMPLIED"              >

+ 

+ <!ENTITY % url.attribute.set

+ "url       CDATA                              #REQUIRED

+ %core.attribute.set;"                                                >

+ 

+ <!ENTITY % value.attribute.set

+ "value     CDATA                              #REQUIRED

+ %core.attribute.set;"                                                >

+ 

+ <!-- ............................................................. -->

+ <!-- ............................................................. -->

+ 

+ <!-- ............................................................. -->

+ <!-- Element Declarations......................................... -->

+ <!-- ............................................................. -->

+ <!--                    omf root element                           -->

+ <!ELEMENT  omf          (resource)+                                  >

+ <!ATTLIST  omf

+              %base.attribute.set;                                    >

+ 

+ <!--                    resource                                   -->

+ <!ELEMENT  resource     (creator+, maintainer*, contributor*, title, 

+                          date, version*, subject*, description?, 

+                          type*, coverage*, format, identifier, 

+                          language, relation, source*, rights*)       >

+ 

+ <!ATTLIST  resource

+              %core.attribute.set;                                    >

+ <!--                    creator                                    -->

+ <!ELEMENT  creator      (#PCDATA)                                    >

+ <!ATTLIST  creator

+              %core.attribute.set;                                    >

+ 

+ <!--                    maintainer                                 -->

+ <!ELEMENT  maintainer   (#PCDATA)                                    >

+ <!ATTLIST  maintainer

+              %core.attribute.set;                                    >

+ 

+ <!--                    contributor                                -->

+ <!ELEMENT  contributor  (#PCDATA)                                    >

+ <!ATTLIST  contributor

+              %core.attribute.set;                                    >

+ 

+ <!--                    title                                      -->

+ <!ELEMENT  title        (#PCDATA)                                    >

+ <!ATTLIST  title

+              %core.attribute.set;                                    >

+ 

+ <!--                    version                                    -->

+ <!ELEMENT  version      EMPTY                                        >

+ <!ATTLIST  version

+              identifier CDATA                              #REQUIRED

+              date       CDATA                              #REQUIRED

+              description CDATA                             #IMPLIED

+              %core.attribute.set;                                    >

+ 

+ <!--                    date                                       -->

+ <!ELEMENT  date         (#PCDATA)                                    >

+ <!ATTLIST  date

+              %core.attribute.set;                                    >

+ <!--                    description                                -->

+ <!ELEMENT  description  (#PCDATA)                                    >

+ <!ATTLIST  description

+              %core.attribute.set;                                    >

+ 

+ <!--                    subject                                    -->

+ <!ELEMENT  subject      EMPTY                                        >

+ <!ATTLIST  subject

+              category   CDATA                              #REQUIRED

+              %core.attribute.set;                                    >

+ 

+ <!--                    type                                       -->

+ <!--                    See coreTypes.mod, an entity set

+                         comprising a formal vocabulary for type    -->

+ <!ELEMENT  type         (#PCDATA)                                    >

+ <!ATTLIST  type

+              %core.attribute.set;                                    >

+ 

+ <!--                    format                                     -->

+ <!ELEMENT  format       EMPTY                                        >

+ <!ATTLIST  format

+              mime       CDATA                              #REQUIRED 

+              dtd        CDATA                              #IMPLIED

+              %core.attribute.set;                                    >

+ 

+ <!--                    identifier                                 -->

+ <!ELEMENT  identifier   EMPTY                                        >

+ <!ATTLIST  identifier

+              %url.attribute.set;                                     >

+  

+ <!--                    source                                     -->

+ <!ELEMENT  source       (#PCDATA)                                    >

+ <!ATTLIST  source

+              %core.attribute.set;                                    >

+ 

+ <!--                    language                                   -->

+ <!--                    see languageCodes.mod, an entity set

+                         comprising a formal vocabulary for

+                         language, derived from ISO 639 and 639-2   -->

+ <!ELEMENT  language     EMPTY                                        >

+ <!ATTLIST  language

+              code       CDATA                              #REQUIRED

+              name       CDATA                              #IMPLIED

+              src        CDATA                              #IMPLIED

+              %core.attribute.set;                                    >

+ 

+ <!--                    relation                                   -->

+ <!ELEMENT  relation     EMPTY                                        >

+ <!ATTLIST  relation

+              seriesid   CDATA                              #REQUIRED

+              %core.attribute.set;                                    >

+ 

+ <!--                    coverage                                   -->

+ <!ELEMENT  coverage     EMPTY                                        >

+ <!ATTLIST  coverage

+              geographic   CDATA                            #IMPLIED

+              distribution CDATA                            #IMPLIED

+              kernel       CDATA                            #IMPLIED

+              architecture CDATA                            #IMPLIED

+              os           CDATA                            #IMPLIED

+              %core.attribute.set;                                    >

+ <!--                    rights                                     -->

+ <!--                    see licenseTypes.mod, an entity set

+                         comprising a formal vocabulary for rights  -->

+ <!ELEMENT  rights       EMPTY                                        >

+ <!ATTLIST  rights

+              type       CDATA                              #IMPLIED

+              license    CDATA                              #IMPLIED

+              license.version CDATA                         #IMPLIED

+              holder     CDATA                              #IMPLIED

+              %core.attribute.set;                                    >

+ <!-- ............................................................. -->

+ <!-- ............................................................. -->

+ 

no initial comment

Updated the fixes:

  • Removed autotools fix as it's not needed to update Makefiles or configure scripts with the new fix.

  • Fixed rpath problem by seding the upstream libtool on %configure step.

  • Chaged Source to upstream one - the tarbal is the same so it can be reverted.

  • Removed unused build requires - libxslt-devel.

Builds on Copr https://copr.fedorainfracloud.org/coprs/iago/rarian/build/2614264/

Note: somewhat this remote PR got cached and includes my repo's README.md file even when I changed it to match the original. Please remove.

The PR was based on a repo with no common history which caused some of the odd deltas. As I discussed with iago I took their changes and applied them directory and credited them properly. Closing this.

Pull-Request has been closed by troycurtisjr

5 months ago