- author don't want to separate packages with modules,

Changed files:
    XdeFactor-ng.spec -> 1.16

diff --git a/XdeFactor-ng.spec b/XdeFactor-ng.spec
index c38c4917837cfc36144cba9c4927c5b792535409..797029c6dcb621f47e382dd9ae2ef33d3eeffe14 100644 (file)
--- a/XdeFactor-ng.spec
+++ b/XdeFactor-ng.spec
@@ -10,7 +10,7 @@ Summary:      XdeFactor - New Generation of program to make invoices
 Summary(pl):   XdeFactor - Nowa Generacja programu do fakturowania
 Name:          XdeFactor-ng
 Version:       %{_snap}
-Release:       1
+Release:       1.9
 License:       GPL
 Group:         Applications
 BuildRequires: glib2-devel
@@ -39,78 +39,6 @@ Ca
 magazynów, zarz±dzania us³ugami/towarami, zarz±dzania ¶rodkami transportu,
 zarz±dzania fakturami archiwalnymi. Jest on oparty o bibliotekê GTK+2.
 
-%package module-clients
-Summary:       XdeFactor - Clients module
-Summary(pl):   XdeFactor - Modu³ obs³ugi klientów
-Group:          Applications
-Requires:       %{name} = %{version}
-
-%description module-clients
-With this module you can manage your clients.
-
-%description module-clients -l pl
-Dziêki temu modu³owi bêdziesz móg³ zarz±dzaæ klientami.
-
-%package module-goods
-Summary:       XdeFactor - Goods module
-Summary(pl):   XdeFactor - Modu³ zarz±dzania towarami/us³ugami
-Group:         Applications
-Requires:      %{name} = %{version}
-
-%description module-goods
-With this module you can manage your goods or services.
-
-%description module-goods -l pl
-Dziêki temu modu³owi bêdziesz móg³ zarz±dzaæ us³ugami/towarami.
-
-%package module-invoices
-Summary:       XdeFactor - Invoices module
-Summary:       XdeFactor - modu³ fakturowania
-Group:         Applications
-Requires:      %{name} = %{version}
-
-%description module-invoices
-With this module you can prepare invoice.
-
-%description module-invoices -l pl
-Dziêki temu modu³owi bêdziesz móg³ wystawiaæ faktury VAT.
-
-%package module-meansoftransport
-Summary:       XdeFactor - Means Of Transport module
-Summary(pl):   XdeFactor - modu³ ¶rodków transportów
-Group:         Applications
-Requires:      %{name} = %{version}
-
-%description module-meansoftransport
-This module manage means of transport.
-
-%description module-meansoftransport
-Modu³ odpowiedzialny jest za operacje na ¶rodkach transportu.
-
-%package module-stores
-Summary:       XdeFactor - Stores module
-Summary(pl):   XdeFactor - modu³ magazynu
-Group:         Applications
-Requires:      %{name} = %{version}
-
-%description module-stores
-This module manage stores.
-
-%description module-stores -l pl
-Jest to modu³ do obs³ugi magazynu
-
-%package module-archiveinvoices
-Summary:       XdeFactor - Archive Invoices module
-Summary(pl):   XdeFactor - modu³ operacji na archiwalnych fakturach
-Group:         Applications
-Requires:      %{name} = %{version}
-
-%description module-archiveinvoices
-This module allow to works on archived invoices.
-
-%description module-archiveinvoices -l pl
-Tem modu³ s³y¿y do operacji na archiwalnych fakturach.
-
 %prep
 %setup -q -n xdefactor-ng
 %patch0 -p1
@@ -157,77 +85,6 @@ done
 
 %postun -p /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 
-/sbin/ldconfig
-
-%postun module-clients
-umask 022
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i clients > %{_sysconfdir}/defactor-ng/x/modules.conf.tmp
-mv %{_sysconfdir}/defactor-ng/x/modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-# GOODS
-%post module-goods
-echo "/modules/Goods.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_goods.so" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-%postun module-goods
-umask 022
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i goods > %{_sysconfdir}/defactor-ng/x/modules.conf.tmp
-mv %{_sysconfdir}/defactor-ng/x/modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-# INVOICES
-%post module-invoices
-echo "/modules/Invoices.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_invoices.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-%postun module-invoices
-umask 022
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i invoices > %{_sysconfdir}/defactor-ng/x/modules.conf.tmp
-mv %{_sysconfdir}/defactor-ng/x/modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-# MEANS OF TRANSPORT
-%post module-meansoftransport
-echo "/modules/MeansOfTransport.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_meansoftransport.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-%postun module-meansoftransport
-umask 022
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i meansoftransport > %{_sysconfdir}/defactor-ng/x/modules.conf.tmp
-mv %{_sysconfdir}/defactor-ng/x/modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-# STORES
-%post module-stores
-echo "/modules/Stores.conf" >> %{_sysconfdir}/defactor-ng/x/modules.conf
-echo "libxdef_stores.so"  >> %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-%postun module-stores
-umask 022
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i stores > %{_sysconfdir}/defactor-ng/x/modules.conf.tmp
-mv %{_sysconfdir}/defactor-ng/x/modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
-# 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
-/sbin/ldconfig
-
-%postun module-archiveinvoices
-cat %{_sysconfdir}/defactor-ng/x/modules.conf | grep -v -i archiveinvoices > %{_sysconfdir}/defactor-ng/x/modules.conf.tmp
-mv %{_sysconfdir}/defactor-ng/x/modules.conf.tmp %{_sysconfdir}/defactor-ng/x/modules.conf
-/sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -238,39 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/images/logo.jpg
 %{_sysconfdir}/defactor-ng/x/*.conf
 %{_sysconfdir}/defactor-ng/x/host.name
-%{_sysconfdir}/defactor-ng/x/modules/Login.conf
-%{_sysconfdir}/defactor-ng/x/modules/Logout.conf
-%{_sysconfdir}/defactor-ng/x/modules/About.conf
-%{_libdir}/libxdef_login.so
+%{_sysconfdir}/defactor-ng/x/modules/*.conf
+%{_libdir}/libxdef_*.so
 %{_libdir}/libxdef_logout.so
 %{_libdir}/libxdef_about.so
-
-%files module-clients
-%defattr(644,root,root,755)
-%{_libdir}/libxdef_clients.so
-%{_sysconfdir}/defactor-ng/x/modules/Clients.conf
-
-%files module-goods
-%defattr(644,root,root,755)
-%{_libdir}/libxdef_goods.so
-%{_sysconfdir}/defactor-ng/x/modules/Goods.conf
-
-%files module-invoices
-%defattr(644,root,root,755)
-%{_libdir}/libxdef_invoices.so
-%{_sysconfdir}/defactor-ng/x/modules/Invoices.conf
-
-%files module-meansoftransport
-%defattr(644,root,root,755)
-%{_libdir}/libxdef_meansoftransport.so
-%{_sysconfdir}/defactor-ng/x/modules/MeansOfTransport.conf
-
-%files module-stores
-%defattr(644,root,root,755)
-%{_libdir}/libxdef_stores.so
-%{_sysconfdir}/defactor-ng/x/modules/Stores.conf
-
-%files module-archiveinvoices
-%defattr(644,root,root,755)
-%{_libdir}/libxdef_archiveinvoices.so
-%{_sysconfdir}/defactor-ng/x/modules/ArchiveInvoices.conf