Changeset 4ce51255

Timestamp:

05/26/2021 08:58:20 PM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

8000e557

Parents:

af07003

Message:

gnome-keyring: Stop moving the PAM module
enchant: Adapt to the enchant-2 symlink changes

Files:

• general/genlib/enchant.xml (modified) (3 diffs)
• gnome/platform/gnome-keyring.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/genlib/enchant.xml

@@ -202 +202 @@
 
       <seglistitem>
-        <seg>enchant (symbolic link to enchant-2) and enchant-lsmod-2</seg>
-        <seg>libenchant-2.so and libenchant.so (symbolic link to
-        libenchant-2.so)</seg>
-        <seg>/usr/include/enchant{,-2}, /usr/lib/enchant-2, and
+        <seg>enchant-2 and enchant-lsmod-2</seg>
+        <seg>libenchant-2.so</seg>
+        <seg>/usr/include/enchant-2, /usr/lib/enchant-2, and
         /usr/share/enchant</seg>
       </seglistitem>
@@ -215 +214 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="enchant-prog">
-        <term><command>enchant</command></term>
+      <varlistentry id="enchant-2">
+        <term><command>enchant-2</command></term>
         <listitem>
           <para>
             is a spellchecker
           </para>
-          <indexterm zone="enchant enchant-prog">
-            <primary sortas="b-enchant">enchant</primary>
+          <indexterm zone="enchant enchant-2">
+            <primary sortas="b-enchant-2">enchant-2</primary>
           </indexterm>
         </listitem>
@@ -239 +238 @@
       </varlistentry>
 
-      <varlistentry id="libenchant">
-        <term><filename class="libraryfile">libenchant.so</filename></term>
+      <varlistentry id="libenchant-2">
+        <term><filename class="libraryfile">libenchant-2.so</filename></term>
         <listitem>
           <para>
             contains spell checking interface API functions
           </para>
-          <indexterm zone="enchant libenchant">
-            <primary sortas="c-libenchant">libenchant.{so,a}</primary>
+          <indexterm zone="enchant libenchant-2">
+            <primary sortas="c-libenchant-2">libenchant-2.so</primary>
           </indexterm>
         </listitem>

gnome/platform/gnome-keyring.xml

@@ -111 +111 @@
 
 ./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --with-pam-dir=/lib/security &&
+            --sysconfdir=/etc &&
 make</userinput></screen>
 
@@ -136 +135 @@
     </para>
 
+    <!-- FIXME: Removed with usr-merge
     <para>
-      <parameter>--with-pam-dir=/lib/security</parameter>: This switch
+      <parameter>- -with-pam-dir=/lib/security</parameter>: This switch
       specifies where the PAM module will be installed.
     </para>
+    -->
 
   </sect2>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Stop moving the PAM Module to /lib/security in
+          gnome-keyring.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Upgrade to librsvg-2.50.6. Fixes
           <ulink url="&blfs-ticket-root;15084">#15084</ulink>.</para>