- release 0.4,

- added sample conf,
- some cleanups with modules,

Changed files:
    XdeFactor-ng.spec -> 1.10

diff --git a/XdeFactor-ng.spec b/XdeFactor-ng.spec
index a7ef6f20f53d071f984774e97fe8e4070904c9b4..9470b8d5daede6c15cef89eb3bbb9d14ee6de0f1 100644 (file)
--- a/XdeFactor-ng.spec
+++ b/XdeFactor-ng.spec
@@ -8,17 +8,15 @@ Summary:      XdeFactor - New Generation
 Summary(pl):   XdeFactor - Nowa Generacja
 Name:          XdeFactor-ng
 Version:       %{_snap}
-Release:       0.3
+Release:       0.4
 License:       GPL
 Group:         Applications
 BuildRequires: glib2-devel
 BuildRequires: postgresql-devel
-Requires:      %{name}-module-login = %{version}
-Requires:       %{name}-module-logout = %{version}
-Requires:      %{name}-module-about = %{version}
 Prereq:        /sbin/ldconfig
 Source0:       http://defactor-ng.gnu.pl/XdeFactor-ng_snapshots/%{name}_%{version}.tar.gz
 Source1:       %{name}.conf
+Source2:       %{name}-modules.conf
 Patch0:                %{name}-includes.patch
 Patch1:                %{name}-modules-includes.patch
 URL:           http://defactor-ng.gnu.pl/
@@ -30,42 +28,6 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Ca³kiem s³odki program do fakturowania, obs³ugi klientów, sprzeda¿y
 i nie wiem czego jeszcze, oparty o GTK+2.
 
-%package module-login
-Summary:       XdeFactor - Login Module
-Summary(pl):   XdeFacotr - Modu³ logowania
-Group:         Applications
-Requires:      %{name} = %{version}
-
-%description module-login
-Login authentication module.
-
-%description module-login -l pl
-Modu³ logowania.
-
-%package module-logout
-Summary:       XdeFactor - Logout Module
-Summary(pl):   XdeFactor - Modu³ wylogowania
-Group:          Applications
-Requires:      %{name} = %{version}
-
-%description module-logout
-Logout module.
-
-%description module-logout -l pl
-Modu³ wylogowania.
-
-%package module-about
-Summary:       XdeFactor - About Module
-Summary(pl):   XdeFactor - Modu³ "O programie"
-Group:          Applications
-Requires:       %{name} = %{version}
-
-%description module-about
-About module.
-
-%description module-about -l pl
-Modu³ "O programie".
-
 %package module-clients
 Summary:       XdeFactor - Clients module
 Summary(pl):   XdeFactor - Modu³ obs³ugi klientów
@@ -165,6 +127,8 @@ 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
         
@@ -186,48 +150,13 @@ cat %{_sysconfdir}/ld.so.conf | grep -v xdefactor-ng > /tmp/ld.so.conf.tmp
 mv /tmp/ld.so.conf.tmp %{_sysconfdir}/ld.so.conf
 /sbin/ldconfig
 
-# LOGIN
-%post module-login
-echo "/modules/Login.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_login.so" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-%postun module-login
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i login > /tmp/xdf-modules.conf.tmp
-mv /tmp/xdf-modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-# LOGOUT
-%post module-logout
-echo "/modules/Logout.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_logout.so" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-%postun module-logout
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i logout > /tmp/xdf-modules.conf.tmp
-mv /tmp/xdf-modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-# ABOUT
-%post module-about
-echo "/modules/About.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_about.so" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-%postun module-about
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i about > /tmp/xdf-modules.conf.tmp
-mv /tmp/xdf-modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
 # CLIENTS
 %post module-clients
 echo "/modules/Clients.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
 echo "libxdef_clients.so" >> %{_sysconfdir}/defactor-ng/x/modules.conf 
+chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
+/sbin/ldconfig
+
 
 %postun module-clients
 cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i clients > /tmp/xdf-modules.conf.tmp
@@ -239,6 +168,8 @@ chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
 %post module-goods
 echo "/modules/Goods.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
 echo "libxdef_goods.so" >> %{_sysconfdir}/defactor-ng/x/modules.conf
+chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
+/sbin/ldconfig
 
 %postun module-goods
 cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i goods > /tmp/xdf-modules.conf.tmp
@@ -250,6 +181,8 @@ chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
 %post module-invoices
 echo "/modules/Invoices.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
 echo "libxdef_invoices.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf
+chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
+/sbin/ldconfig
 
 %postun module-invoices
 cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i invoices > /tmp/xdf-modules.conf.tmp
@@ -261,7 +194,9 @@ chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
 %post module-meansoftransport
 echo "/modules/MeansOfTransport.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
 echo "libxdef_meansoftransport.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf
-                                                                                
+chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
+/sbin/ldconfig
+
 %postun module-meansoftransport
 cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i meansoftransport > /tmp/xdf-modules.conf.tmp
 mv /tmp/xdf-modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
@@ -271,7 +206,10 @@ chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
 # STORES
 %post module-stores
 echo "/modules/Stores.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_stores.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf                                                                                
+echo "libxdef_stores.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf
+chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
+/sbin/ldconfig
+
 %postun module-stores
 cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i stores > /tmp/xdf-modules.conf.tmp
 mv /tmp/xdf-modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
@@ -281,7 +219,10 @@ chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
 # ARCHIVE INVOICES
 %post module-archiveinvoices
 echo "/modules/ArchiveInvoices.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_archiveinvoices.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf                                                                                
+echo "libxdef_archiveinvoices.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf
+chmod 644 %{_sysconfdir}/defactor-ng/x/modules.conf
+/sbin/ldconfig
+
 %postun module-archiveinvoices
 cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i archiveinvoices > /tmp/xdf-modules.conf.tmp
 mv /tmp/xdf-modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
@@ -298,21 +239,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 %{_sysconfdir}/defactor-ng/x/*.conf
 %{_sysconfdir}/defactor-ng/x/host.name
-
-%files module-login
-%defattr(644,root,root,755)
-%{_libdir}/xdefactor-ng/libxdef_login.so
 %{_sysconfdir}/defactor-ng/x/modules/Login.conf
-
-%files module-logout
-%defattr(644,root,root,755)
-%{_libdir}/xdefactor-ng/libxdef_logout.so
 %{_sysconfdir}/defactor-ng/x/modules/Logout.conf
-
-%files module-about
-%defattr(644,root,root,755)
-%{_libdir}/xdefactor-ng/libxdef_about.so
 %{_sysconfdir}/defactor-ng/x/modules/About.conf
+%{_libdir}/xdefactor-ng/libxdef_login.so
+%{_libdir}/xdefactor-ng/libxdef_logout.so
+%{_libdir}/xdefactor-ng/libxdef_about.so
 
 %files module-clients
 %defattr(644,root,root,755)