From 168a9eed1acb5073579e73af1a18a76d81605e21 Mon Sep 17 00:00:00 2001
From: Oron Peled <oron@actcom.co.il>
Date: May 12 2012 22:17:03 +0000
Subject: Fix '%lang' for --with-mangs. Fix exclude of python3.


---

diff --git a/debconf.spec b/debconf.spec
index c50692c..e826a4c 100644
--- a/debconf.spec
+++ b/debconf.spec
@@ -1,6 +1,6 @@
 Name:           debconf
 Version:        1.5.42
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Debian configuration management system
 
 Group:          Development/Tools
@@ -104,8 +104,11 @@ for man in \
 
     for level in 1 8; do
         for lang in de fr pt_BR ru; do
-            test -f doc/man/gen/$man.$lang.$level && \
+            if test -f doc/man/gen/$man.$lang.$level; then
+                short_lang=`echo "$lang" | sed 's/_.*//'`
                 install -m 644 doc/man/gen/$man.$lang.$level %{buildroot}/%{_mandir}/$lang/man$level/$man.$level
+                echo "%lang($short_lang) %{_mandir}/$lang/man$level/$man.$level*" >> "man-i18n.lang"
+            fi
         done
         test -f doc/man/gen/$man.$level && \
             install -m 644 doc/man/gen/$man.$level %{buildroot}/%{_mandir}/man$level/$man.$level
@@ -122,29 +125,34 @@ for man in \
 
     for level in 3 5 7; do
         for lang in de fr pt_BR ru; do
-            test -f doc/man/$man.$lang.$level* && \
+            if test -f doc/man/$man.$lang.$level*; then
+                short_lang=`echo "$lang" | sed 's/_.*//'`
                 install -m 644 doc/man/$man.$lang.$level* %{buildroot}/%{_mandir}/$lang/man$level/$man.$level
+                echo "%lang($short_lang) %{_mandir}/$lang/man$level/$man.$level*" >> "man-doc.lang"
+            fi
         done
         test -f doc/man/$man.$level && \
             install -m 644 doc/man/$man.$level %{buildroot}/%{_mandir}/man$level/$man.$level
     done
 done
 
-
 # Utils man pages
 for man in get-selections \
             getlang \
             loadtemplate \
             mergetemplate; do
     for lang in de fr pt_BR ru; do
-        test -f doc/man/gen/debconf-$man.$lang.1 && \
+        short_lang=`echo "$lang" | sed 's/_.*//'`
+        if test -f doc/man/gen/debconf-$man.$lang.1; then
             install -m 644 doc/man/gen/debconf-$man.$lang.1 %{buildroot}/%{_mandir}/$lang/man1/debconf-$man.1
+            echo "%lang($short_lang) %{_mandir}/$lang/man1/debconf-$man.1*" >> "man-utils.lang"
+        fi
     done
     test -f doc/man/gen/debconf-$man.1 && \
         install -m 644 doc/man/gen/debconf-$man.1 %{buildroot}/%{_mandir}/man1/debconf-$man.1
 done
 
-%find_lang debconf --with-man --all-name
+%find_lang debconf
 
 %files -f debconf.lang
 %doc doc/README doc/EXAMPLES doc/CREDITS doc/README.translators doc/README.LDAP doc/TODO
@@ -160,7 +168,7 @@ done
 %{_sbindir}/dpkg-preconfigure
 %{_sbindir}/dpkg-reconfigure
 %{python_sitelib}/debconf.*
-%exclude %{_libdir}/python3
+%exclude /usr/lib/python3
 %{perl_vendorlib}/Debconf
 %{perl_vendorlib}/Debian
 %{_datadir}/%{name}
@@ -175,7 +183,7 @@ done
 %{_mandir}/man8/dpkg-reconfigure.8*
 %{_datadir}/pixmaps/debian-logo.png
 
-%files doc -f debconf.lang
+%files doc -f man-doc.lang
 %doc samples/
 %doc doc/CREDITS doc/README doc/README.LDAP doc/TODO
 %doc debian/changelog
@@ -184,29 +192,15 @@ done
 %doc doc/hierarchy.txt
 %doc doc/namespace.txt
 %doc doc/passthrough.txt
-%{_mandir}/*/man3/Debconf::Client::ConfModule.3*
-%{_mandir}/*/man3/confmodule.3*
-%{_mandir}/*/man5/debconf.conf.5*
-%{_mandir}/*/man7/debconf-devel.7*
-%{_mandir}/*/man7/debconf.7*
 %{_mandir}/man3/confmodule.3*
 %{_mandir}/man5/debconf.conf.5*
 %{_mandir}/man7/debconf-devel.7*
 %{_mandir}/man7/debconf.7*
 
-%files i18n -f debconf.lang
+%files i18n -f man-i18n.lang
 %doc debian/changelog debian/copyright debian/README.Debian
-%{_mandir}/*/man1/debconf-apt-progress.1*
-%{_mandir}/*/man1/debconf-communicate.1*
-%{_mandir}/*/man1/debconf-copydb.1*
-%{_mandir}/*/man1/debconf-escape.1*
-%{_mandir}/*/man1/debconf-set-selections.1*
-%{_mandir}/*/man1/debconf-show.1*
-%{_mandir}/*/man1/debconf.1*
-%{_mandir}/*/man8/dpkg-preconfigure.8*
-%{_mandir}/*/man8/dpkg-reconfigure.8*
-
-%files utils -f debconf.lang
+
+%files utils -f man-utils.lang
 %doc debian/changelog debian/copyright debian/README.Debian
 %{_bindir}/debconf-get-selections
 %{_bindir}/debconf-getlang
@@ -216,12 +210,14 @@ done
 %{_mandir}/man1/debconf-getlang.1*
 %{_mandir}/man1/debconf-loadtemplate.1*
 %{_mandir}/man1/debconf-mergetemplate.1*
-%{_mandir}/*/man1/debconf-get-selections.1*
-%{_mandir}/*/man1/debconf-getlang.1*
-%{_mandir}/*/man1/debconf-loadtemplate.1*
-%{_mandir}/*/man1/debconf-mergetemplate.1*
 
 %changelog
+* Sat May 12 2012 Oron Peled <oron@actcom.co.il> - 1.5.42-4
+- Fix find_lang for man-pages. It is not smart enough to do
+  it all in one swoop. So we generate the expected results
+  manually (during installation)
+- Fix exclude of python3 (picked wrong directory on x86-64
+
 * Tue May  1 2012 Oron Peled <oron@actcom.co.il> - 1.5.42-3
 - Added --with-man and --all-name to find_lang
 - Use wild-cards for language directories of man-pages