- microperl Group changed to Development/Languages/Perl

[packages/perl.git] / perl.spec

diff --git a/perl.spec b/perl.spec
index ae2b7e9abd1b3808bcdb494df987222f181016b6..bc7380837f334a122aa2a43eaf260372f24ef62c 100644 (file)
--- a/perl.spec
+++ b/perl.spec
@@ -81,6 +81,8 @@ URL:          http://dev.perl.org/perl5/
 BuildRequires: gcc >= 5:4.1
 %endif
 %{?with_gdbm:BuildRequires:    gdbm-devel}
+# asm-generic, merged x86 asm dirs
+BuildRequires: linux-libc-headers >= 7:2.6.24
 # required for proper Provides generation (older are not supported by spec)
 BuildRequires: rpm-build >= 4.3-0.20040107.4
 BuildRequires: rpmbuild(macros) >= 1.426
@@ -605,8 +607,7 @@ podselect   - wypisanie wybranych sekcji z dokumentacji POD
 %package -n microperl
 Summary:       A really minimal Perl, even more minimal than miniperl
 Summary(pl.UTF-8):     Naprawdę minimalny Perl, nawet bardziej minimalny niż miniperl
-# XXX: is there a more appropiate group?
-Group:         Applications
+Group:         Development/Languages/Perl
 
 %description -n microperl
 microperl is supposed to be able a really minimal Perl, even more
@@ -673,9 +674,6 @@ sh Configure \
        -%{?with_threads:D}%{!?with_threads:U}usethreads \
        -Duselargefiles
 
-## why were these three undefined?
-#      -Ud_setresgid \
-#      -Ud_setresuid \
 ## what's the problem with this one?
 # %ifarch sparc sparc64
 #      -Ud_longdbl
@@ -740,9 +738,13 @@ install -d $RPM_BUILD_ROOT%{_mandir}/{ja,ko,zh_CN,zh_TW}/man1
 
 ## Fix lib
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so
-%{__ln_s} `%{__perl} -e '$_="'%{perl_archlib}/CORE/libperl.so.%{_abi}'";s|^'%{_libdir}'/*||;print'` \
-       $RPM_BUILD_ROOT%{_libdir}/libperl.so.%{_abi}
+#%{__ln_s} `%{__perl} -e '$_="'%{perl_archlib}/CORE/libperl.so.%{_abi}'";s|^'%{_libdir}'/*||;print'` \
+#      $RPM_BUILD_ROOT%{_libdir}/libperl.so.%{_abi}
+mv $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so.%{_abi} $RPM_BUILD_ROOT%{_libdir}
+%{__ln_s} ../../../../libperl.so.%{_abi} $RPM_BUILD_ROOT%{perl_archlib}/libperl.so.%{_abi}
 %{__ln_s} libperl.so.%{_abi} $RPM_BUILD_ROOT%{_libdir}/libperl.so
+# installed as non-executable - let rpm generate deps
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libperl.so.%{_abi}
 
 ## Fix Config.pm: remove buildroot path and change man pages extensions
 %{__perl} -pi -e 's,%{buildroot}/*,/,g'                        $RPM_BUILD_ROOT%{perl_archlib}/Config.pm
@@ -841,24 +843,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libperl.so.*
-%dir %{_libdir}/perl5
-%dir %{_libdir}/perl5/%{version}
-%dir %{perl_archlib}
-%dir %{perl_archlib}/CORE
-%attr(755,root,root) %{perl_archlib}/CORE/libperl.so.%{_abi}
+%attr(755,root,root) %{_libdir}/libperl.so.%{_abi}
 
 %files base
 %defattr(644,root,root,755)
 %doc doc-base/*
 %attr(755,root,root) %{_bindir}/perl
 %attr(755,root,root) %{_bindir}/perl%{version}
-%{_mandir}/man1/perl.*
-%lang(fi) %{_mandir}/fi/man1/perl*
-%lang(pl) %{_mandir}/pl/man1/perl*
+%{_mandir}/man1/perl.1*
+%lang(fi) %{_mandir}/fi/man1/perl.1*
+%lang(pl) %{_mandir}/pl/man1/perl.1*
 
 %dir %{_datadir}/perl5
 %dir %{perl_privlib}
+%dir %{_libdir}/perl5
+%dir %{_libdir}/perl5/%{version}
+%dir %{perl_archlib}
+%dir %{perl_archlib}/CORE
+%attr(755,root,root) %{perl_archlib}/CORE/libperl.so.%{_abi}
 %dir %{perl_archlib}/auto
 
 %dir %{_libdir}/perl5/vendor_perl
@@ -1065,6 +1067,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/perld[!o]*
 %{_mandir}/man1/perli[!v]*
 
+%lang(fi) %{_mandir}/fi/man1/perlbook.1*
+%lang(pl) %{_mandir}/pl/man1/perldata.1*
+%lang(pl) %{_mandir}/pl/man1/perl[fors]*.1*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/perlcn.*
 %lang(ja) %{_mandir}/ja/man1/perljp.*
 %lang(ko) %{_mandir}/ko/man1/perlko.*