Index: /projects/fossology/pbconf/trunk/fossology/rpm/fossology.spec
===================================================================
--- /projects/fossology/pbconf/trunk/fossology/rpm/fossology.spec	(revision 610)
+++ /projects/fossology/pbconf/trunk/fossology/rpm/fossology.spec	(revision 616)
@@ -2,6 +2,4 @@
 # $Id$
 #
-# Used if virtual name != real name (perl, ...)
-#%define srcname	PBPKG
 
 Name:           PBREALPKG
@@ -15,5 +13,5 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 Requires:       postgresql php php-pear php-pgsql libxml2 binutils bzip2 cpio mkisofs poppler-utils rpm tar unzip gzip httpd PBDEP
-BuildRequires:	postgresql-devel libxml2 gcc make perl PBBUILDDEP
+BuildRequires:  postgresql-devel libxml2 gcc make perl PBBUILDDEP
 Summary:        FOSSology is a licenses exploration tool
 Summary(fr):    FOSSology est un outil d'exploration de licenses
@@ -61,4 +59,6 @@
 EOF
 
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/default/PBPROJ
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -69,16 +69,13 @@
 %doc COPYING COPYING.LGPL HACKING README INSTALL INSTALL.multi LICENSE 
 #AUTHORS NEWS
-%dir %{_datadir}/*
-%dir %{_localstatedir}/PBPROJ
-%dir %{_libdir}/PBPROJ
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
+%config(noreplace) %{_sysconfdir}/cron.d/*
+%config(noreplace) %{_sysconfdir}/PBPROJ/*
 %dir %{_sysconfdir}/PBPROJ
+%dir %{_usr}/lib/PBPROJ
 %dir %{_datadir}/PBPROJ
-%{_sysconfdir}/PBPROJ/*
+%{_sysconfdir}/init.d/*
 %{_usr}/lib/PBPROJ/*
-%{_localstatedir}/PBPROJ/*
 %{_datadir}/PBPROJ/*
-%{_sysconfdir}/httpd/conf.d/*.conf
-%{_sysconfdir}/cron.d/*
-%{_sysconfdir}/init.d/*
 %{_bindir}/*
 %{_mandir}/man1/*