- some cleanups (work by Paszczus)

Changed files:
    adduser-ng.spec -> 1.6

diff --git a/adduser-ng.spec b/adduser-ng.spec
index c9eec8efe029b066934c98bbca7381b54fdc416a..2ec01de4a774110739bc103799686a2932ed7490 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.1
+Release:       0.0.2
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://teon.org/projects/AddUser-NG/download/release-%{version}/source/%{name}_%{version}-1.tar.gz
@@ -18,8 +18,6 @@ Requires:     shadow
 Obsoletes:     adduser
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define          _libdir         /usr/share/perl5/AddUser
-
 %description
 AddUser-NG stands for AddUser Next Generation. It's meant to be a
 replacement for adduser script. Most of all it's useful for system
@@ -56,14 +54,14 @@ modularny:
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/{UI,plugins},%{_sysconfdir}/%{name}/groups,%{_datadir}/%{name}/plugins}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{perl_privlib}/AddUser/{UI,plugins},%{_sysconfdir}/%{name}/groups,%{_datadir}/%{name}/plugins}
 
 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%{_libdir}
-install lib/AddUser/UI/* $RPM_BUILD_ROOT%{_libdir}/UI
-install lib/AddUser/plugins/* $RPM_BUILD_ROOT%{_libdir}/plugins
+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
 
@@ -74,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc Docs/*
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}
+%attr(755,root,root) %{perl_privlib}/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