- use more macros, missing dirs

- %%config(noreplace) for config files

Changed files:
    XdeFactor-ng.spec -> 1.19

diff --git a/XdeFactor-ng.spec b/XdeFactor-ng.spec
index b49ba4b803240821afd8f027fc0df87b52c8afb7..f96f404dd53675dbdcc3f76a666b1d8b746260b0 100644 (file)
--- a/XdeFactor-ng.spec
+++ b/XdeFactor-ng.spec
@@ -13,13 +13,6 @@ Version:     %{_snap}
 Release:       2
 License:       GPL
 Group:         Applications
-BuildRequires: glib2-devel
-BuildRequires: postgresql-devel
-BuildRequires: gtk+2-devel
-BuildRequires: pango-devel
-BuildRequires: pkgconfig
-BuildRequires: freetype-devel
-Prereq:                /sbin/ldconfig
 Source0:       http://defactor-ng.gnu.pl/XdeFactor-ng_snapshots/%{name}_%{version}.tar.gz
 Source1:       %{name}.conf
 Source2:       %{name}-modules.conf
@@ -27,6 +20,12 @@ Patch0:              %{name}-includes.patch
 Patch1:                %{name}-modules-includes.patch
 Patch2:                %{name}-sharedir.patch
 URL:           http://defactor-ng.gnu.pl/
+BuildRequires: freetype-devel
+BuildRequires: glib2-devel
+BuildRequires: gtk+2-devel
+BuildRequires: pango-devel
+BuildRequires: pkgconfig
+BuildRequires: postgresql-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,13 +47,13 @@ bibliotek
 
 %build
 cd src
-%{__make} CC="gcc %{rpmcflags}"
+%{__make} CC="%{__cc} %{rpmcflags}"
 
 cd modules
 
 for i in %{_modules}; do
  cd $i
- %{__make} CC="gcc %{rpmcflags}"
+ %{__make} CC="%{__cc} %{rpmcflags}"
  cd ..
 done
 
@@ -62,39 +61,42 @@ done
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/defactor-ng/x/modules/,%{_bindir},%{_datadir}/%{name}/images,%{_libdir}}
 
-install src/xdefactor-ng $RPM_BUILD_ROOT/%{_bindir}/
-install conf/logo.jpg $RPM_BUILD_ROOT/%{_datadir}/%{name}/images/
-#install conf/modules.conf.example $RPM_BUILD_ROOT/%{_datadir}/%{name}/
-install conf/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/defactor-ng/x/
-install conf/host.name $RPM_BUILD_ROOT%{_sysconfdir}/defactor-ng/x/
+install src/xdefactor-ng $RPM_BUILD_ROOT%{_bindir}
+install conf/logo.jpg $RPM_BUILD_ROOT%{_datadir}/%{name}/images
+#install conf/modules.conf.example $RPM_BUILD_ROOT%{_datadir}/%{name}
+install conf/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/defactor-ng/x
+install conf/host.name $RPM_BUILD_ROOT%{_sysconfdir}/defactor-ng/x
 cat %{SOURCE1} >> $RPM_BUILD_ROOT%{_sysconfdir}/defactor-ng/x/xdefactor-ng.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/defactor-ng/x/modules.conf
 
-
 cd src/modules
 
 for i in %{_modules}; do
  cd $i
 for j in *.so; do
-  install $j $RPM_BUILD_ROOT%{_libdir}/
+  install $j $RPM_BUILD_ROOT%{_libdir}
  done
- install *.conf $RPM_BUILD_ROOT%{_sysconfdir}/defactor-ng/x/modules/
+ install *.conf $RPM_BUILD_ROOT%{_sysconfdir}/defactor-ng/x/modules
  cd ..
 done
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README conf/modules.conf.example
 %attr(755,root,root) %{_bindir}/xdefactor-ng
+%attr(755,root,root) %{_libdir}/libxdef_*.so
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/images
 %{_datadir}/%{name}/images/logo.jpg
-%{_sysconfdir}/defactor-ng/x/*.conf
-%{_sysconfdir}/defactor-ng/x/host.name
-%{_sysconfdir}/defactor-ng/x/modules/*.conf
-%{_libdir}/libxdef_*.so
+%dir %{_sysconfdir}/defactor-ng
+%dir %{_sysconfdir}/defactor-ng/x
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/defactor-ng/x/*.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/defactor-ng/x/host.name
+%dir %{_sysconfdir}/defactor-ng/x/modules
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/defactor-ng/x/modules/*.conf