- release 0.3: %perl_{priv,arch}lib allowed only in perl.spec

- "the perl way" of installing *.pm files
- NOTE: duplicate *.pm plugins; AddUser::PluginLoader should be
        patched to add plugin_dir to @INC and require() the plugin
        instead of do()'ing the file manually.

Changed files:
    adduser-ng.spec -> 1.8

diff --git a/adduser-ng.spec b/adduser-ng.spec
index 2777e67dd2cfd19507fb6375b604b7519dd7d1fb..96fbaff0ce9cd9b86c7a333c847d8df53af6bf90 100644 (file)
--- a/adduser-ng.spec
+++ b/adduser-ng.spec
@@ -2,7 +2,7 @@ Summary:        AddUser-NG for UNIX
 Summary(pl):   AddUser-NG dla systemów UNIX
 Name:          adduser-ng
 Version:       0.1.1
-Release:       0.0.2
+Release:       0.3
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://teon.org/projects/AddUser-NG/download/release-%{version}/source/%{name}_%{version}-1.tar.gz
@@ -47,20 +47,25 @@ modularny:
 
 %build
 %{__make} \
-        CC="%{__cc}" \
-        CFLAGS="%{rpmcflags}" \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}" \
        DESTDIR=$RPM_BUILD_ROOT
 
+touch Makefile.PL
+%{__perl} -MExtUtils::MakeMaker -e 'WriteMakefile(NAME=>"AddUser")' \
+       INSTALLDIRS=vendor
+%{__make}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{perl_privlib}/AddUser/{UI,plugins},%{_sysconfdir}/%{name}/groups,%{_datadir}/%{name}/plugins}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/%{name}/groups,%{_datadir}/%{name}/plugins}
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install adduser $RPM_BUILD_ROOT%{_bindir}
 install adduser-ng/adduser-ng.conf-dist $RPM_BUILD_ROOT%{_sysconfdir}/adduser-ng/adduser-ng.conf
 install adduser-ng/groups/adduser $RPM_BUILD_ROOT%{_sysconfdir}/adduser-ng/groups
-install lib/AddUser/*.pm $RPM_BUILD_ROOT%{perl_privlib}/AddUser
-install lib/AddUser/UI/* $RPM_BUILD_ROOT%{perl_privlib}/AddUser/UI
-install lib/AddUser/plugins/* $RPM_BUILD_ROOT%{perl_privlib}/AddUser/plugins
 install lib/AddUser/plugins/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 install Docs/plugins/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
@@ -71,8 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc Docs/*
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{perl_privlib}/AddUser
+%attr(755,root,root) %{perl_vendorlib}/AddUser
 %dir %{_sysconfdir}/adduser-ng
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/adduser-ng/adduser-ng.conf
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/adduser-ng/groups/adduser
 %{_datadir}/%{name}
+%{_mandir}/man3/*