- up

Changed files:
    apache-module.spec -> 1.3
    trac-plugin.spec -> 1.7

diff --git a/apache-module.spec b/apache-module.spec
index 73819b130c5f3f2462697eaf9ec75f1351201f0a..3a44f91d4d736a58b42971e68679547f87f35f90 100644 (file)
--- a/apache-module.spec
+++ b/apache-module.spec
@@ -14,7 +14,7 @@ License:      - (enter Apache/GPL/LGPL/BSD/BSD-like/other license name here)
 Group:         Networking/Daemons/HTTP
 Source0:       -
 # Source0-md5: -
-Source1:       %{name}.conf
+Source1:       apache.conf
 URL:           -
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.2
@@ -39,13 +39,12 @@ MODNAME is Apache module...
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
-
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 # module configuration
 # - should contain LoadModule line
 # - and directives must be between IfModule (so user could disable the module easily)
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
 
 # or, if no directives needed, put just LoadModule line
 echo 'LoadModule %{mod_name}_module    modules/mod_%{mod_name}.so' > \
@@ -66,4 +65,4 @@ fi
 %defattr(644,root,root,755)
 %doc README
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(755,root,root) %{_pkglibdir}/mod_%{mod_name}.so

diff --git a/trac-plugin.spec b/trac-plugin.spec
index 9e1ebad0295b06e56e29f0e76d6de9debe7c6a8a..1723a5806ee9ac653e22b3235755ed99be1c0323 100644 (file)
--- a/trac-plugin.spec
+++ b/trac-plugin.spec
@@ -21,6 +21,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %setup -q -n trac%{plugin}plugin
 %setup -qc
 mv %{plugin}plugin/%{trac_ver}/* .
+mv %{trac_ver}/* .
 
 %build
 %{__python} setup.py build
@@ -43,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 # XXX: try to figure out from .egg-info / __init__py at build time
-#trac-enableplugin %{plugin}.Trac%{plugin}Module
+#trac-enableplugin "%{plugin}.Trac%{plugin}Module"
 
 %files
 %defattr(644,root,root,755)