first draft from OpenSuse

1 files changed, 152 insertions, 465 deletions

diff --git a/firebird.spec b/firebird.spec
index 457b49d..966aa6c 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,4 +1,3 @@
-%global pkgname Firebird-2.5.5.26952-0
 %global fbroot %{_libdir}/%{name}
 %global major 3.0
 %global _hardened_build 1
@@ -6,526 +5,214 @@
 Summary: SQL relational database management system
 Name:  firebird
 Version: 3.0
-Release: 1%{?dist}
+Release:        1.20160226git6127d1e8%{?dist}
 
 Group:  Applications/Databases
 License: Interbase
 URL:  http://www.firebirdsql.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
-Source0: 
-Source1: firebird-logrotate
-Source2: README.Fedora
-Source3: firebird.conf
-Source4: firebird-classic@.service
-Source5: firebird-classic.socket
-Source6: firebird-superclassic.service
-Source7: firebird-superserver.service
-Source8: fb_config
+Source0:        firebird-6127d1e8.tar.gz
+# from OpenSuse
+Patch101: allow-creating-buildRoot-as-non-root-user.patch
+Patch102: add-pkgconfig-files.patch
+
+# from Debian
 
 # from upstream
 
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bison
+BuildRequires: libtommath-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: libtermcap-devel
 BuildRequires: libicu-devel
 BuildRequires: libedit-devel
 BuildRequires: gcc-c++
-%if 0%{?fedora}>=14
 BuildRequires: libstdc++-static
-%endif
-%ifnarch %{ix86} x86_64
-BuildRequires: libatomic_ops-devel
-%endif
 BuildRequires: systemd-units
-BuildRequires: libatomic_ops-static
 BuildRequires: chrpath
 
-Requires: %{name}-arch = %{version}-%{release}
-Requires: grep
-Requires: sed
 Requires(post):  /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(postun): /usr/sbin/userdel
 Requires(postun): /usr/sbin/groupdel
 Requires(pre):  /usr/sbin/groupadd
 Requires(pre):  /usr/sbin/useradd
-Requires:  %{name}-libfbclient
+Requires:  libfbclient2
 Requires:  logrotate
-Requires:  %{name}-filesystem 
 
 %description
-This package contains common files between firebird-classic, firebird-superclassic and
-firebird-superserver. You will need this if you want to use either one.
-
-%package  doc
-Summary:  Documentation for Firebird SQL RDBMS
-Group:    Applications/Databases
-
-%description doc
-This are the Firebird SQL Database shared doc and examples files.
-
-%package  filesystem
-Summary:  Filesystem for Firebird SQL RDBMS
-Group:    Applications/Databases
-
-%description filesystem
-This is the Firebird SQL Database root file system.
-
-%package   classic-common
-Summary:   Common files for Firebird "classic" and "superclassic" servers
-Group:     Applications/Databases
-Requires:  %{name} = %{version}-%{release}
-Requires:  %{name}-libfbembed = %{version}-%{release}
-Conflicts: %{name}-superserver
-
-%description classic-common
-This package contains the command line utilities and files common to classic and superclassic Firebird servers.
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
 
-%package  devel
-Summary:  Development Libraries for Firebird SQL RDBMS
-Group:   Applications/Databases
-Requires:  %{name}-libfbclient = %{version}-%{release}
-Requires:  %{name}-libfbembed = %{version}-%{release}
+%package devel
+Group: Development/Libraries/C and C++
+Requires: %{name} = %{version}
+Summary: UDF support library for Firebird SQL server
 
 %description devel
-Development libraries for firebird.
-
-%package  classic
-Summary:  Classic server for Firebird SQL RDBMS
-Group:   Applications/Databases
-Provides:  %{name}-arch = %{version}-%{release}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-Requires:  %{name} = %{version}-%{release}
-Conflicts:  %{name}-superclassic
-Requires:  %{name}-libfbembed = %{version}-%{release}
-Requires:  %{name}-classic-common = %{version}-%{release} 
-
-%description classic
-This is the Classic server Firebird SQL RDBMS.
-It can also be used as an embedded server, when paired with the
-client-embedded package.
-
-%package  superclassic
-Summary:  SuperClassic (single process) server for Firebird SQL RDBMS
-Group:   Applications/Databases
-Provides:  %{name}-arch = %{version}-%{release}
-Requires:  %{name} = %{version}-%{release}
-Conflicts:  %{name}-classic
-Requires:  %{name}-classic-common = %{version}-%{release} 
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-
-%description  superclassic
-The "superclassic" architecture uses a new thread to handle each connection.
-This allows for good scaling on multi-processor machines without consuming too much operating system resources..
-
-%package  superserver
-Summary:  Superserver (single process) server for Firebird SQL RDBMS
-Group:   Applications/Databases
-Provides:  %{name}-arch = %{version}-%{release}
-Requires:  %{name} = %{version}-%{release}
-Conflicts:  %{name}-classic-common
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-
-%description  superserver
-This is the Superserver (single process) Firebird SQL RDBMS.
-
-%package  libfbclient
-Summary:  Multi-threaded, non-local client libraries for Firebird SQL RDBMS
-Group:   System Environment/Libraries
-Requires(post):  /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description  libfbclient
-Multi-threaded, non-local client libraries for Firebird SQL Database
-
-%package  libfbembed
-Summary:  Multi-process, local client libraries for Firebird SQL RDBMS
-Group:   System Environment/Libraries
-Requires(post):  /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+This package is needed for development of client applications and user
+defined functions (UDF) for Firebird SQL server.
+
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
+
+%package -n libfbclient2
+Group: System Environment/Libraries
+Summary: Firebird SQL server client library
+
+%description -n libfbclient2
+Shared client library for Firebird SQL server.
+
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
+
+%package -n libfbclient2-devel
+Group: System Environment/Libraries
+Summary: Development libraries and headers for Firebird SQL server
+Requires: %{name}-devel
+Requires: libfbclient2 = %{version}
+
+%description -n libfbclient2-devel
+Development files for Firebird SQL server client library.
+
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
+
+%package doc
+Group: Applications/Databases
+Requires: %{name} = %{version}
+Summary: Documentation for Firebird SQL server
+BuildArch: noarch
 
-%description  libfbembed
-Multi-process, local client libraries for Firebird SQL RDBMS
+%description doc
+Documentation for Firebird SQL server.
 
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
 
 %prep
 %setup -q -n %{name}
-# convert intl character to UTF-8
-iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl     -o ./doc/README.intl
+%patch101 -p1
+%patch102 -p1
 
 %build
-
-# classic
-%ifarch sparc64 
-export CXXFLAGS='-m64'
-export CFLAGS='-m64'
-export LDFLAGS='-m64'
-%endif
-%ifarch sparcv9 
-export CXXFLAGS='-m32'
-export CFLAGS='-m32'
-export LDFLAGS='-m32'
-%endif
-
 NOCONFIGURE=1 ./autogen.sh
-%configure --prefix=%{fbroot} --with-system-icu --with-system-editline \
- --with-fbbin=%{fbroot}/bin-classic --with-fbinclude=%{_includedir}/%{name} \
- --with-fbsbin=%{_sbindir} --with-fbconf=%{_sysconfdir}/%{name} --with-fblib=%{_libdir} \
- --with-fbdoc=%{_defaultdocdir}/%{name} --with-fbudf=%{fbroot}/UDF --with-fbsample=%{_defaultdocdir}/%{name}/examples \
- --with-fbsample-db=%{_localstatedir}/lib/%{name}/data/ \
- --with-fbhelp=%{_localstatedir}/lib/%{name}/system/ --with-fbintl=%{fbroot}/intl \
- --with-fbmisc=%{fbroot}/misc --with-fbsecure-db=%{_localstatedir}/lib/%{name}/system \
- --with-fbmsg=%{_localstatedir}/lib/%{name}/system --with-fblog=%{_localstatedir}/log/%{name} \
- --with-fbglock=%{_var}/run/%{name} --with-fbplugins=%{fbroot}/plugins-classic
-%ifarch sparc64 
-sed "s@COMMON_FLAGS=-m32@COMMON_FLAGS=-m64@" -i ./gen/make.platform 
-%endif
-  
-# Can't use make %{?_smp_mflags} as parallel build is broken
-make
-
-cd gen
-sed "s@exit 1@# exit 1@" -i ./install/makeInstallImage.sh
-sed "s@chown@echo ""# chown@g" -i ./install/makeInstallImage.sh
-sed "s@chmod@echo ""# chmod@g" -i ./install/makeInstallImage.sh
-./install/makeInstallImage.sh
-
-mv  ./buildroot/ buildroot-classic
-cd ..
-
-# superserver
-%configure --prefix=%{fbroot} --with-system-icu --with-system-editline --enable-superserver \
- --with-fbbin=%{fbroot}/bin-superserver --with-fbinclude=%{_includedir}/%{name} \
- --with-fbsbin=%{_sbindir} --with-fbconf=%{_sysconfdir}/%{name} --with-fblib=%{_libdir} \
- --with-fbdoc=%{_defaultdocdir}/%{name} --with-fbudf=%{fbroot}/UDF --with-fbsample=%{_defaultdocdir}/%{name}/examples \
- --with-fbsample-db=%{_localstatedir}/lib/%{name}/data/ \
- --with-fbhelp=%{_localstatedir}/lib/%{name}/system/ --with-fbintl=%{fbroot}/intl \
- --with-fbmisc=%{fbroot}/misc --with-fbsecure-db=%{_localstatedir}/lib/%{name}/system \
- --with-fbmsg=%{_localstatedir}/lib/%{name}/system --with-fblog=%{_localstatedir}/log/%{name} \
- --with-fbglock=%{_var}/run/%{name} --with-fbplugins=%{fbroot}/plugins-superserver
-  
-%ifarch sparc64 
-sed "s@COMMON_FLAGS=-m32@COMMON_FLAGS=-m64@" -i ./gen/make.platform 
-%endif
-
-# Can't use make %{?_smp_mflags} as parallel build is broken
-make clean
-make
-
+%configure --prefix=%{_prefix} \
+  --disable-binreloc \
+  --with-system-icu --with-system-editline \
+  --with-fbbin=%{_bindir} --with-fbsbin=%{_sbindir} \
+  --with-fbconf=%{_sysconfdir}/%{name} \
+  --with-fblib=%{_libdir} --with-fbinclude=%{_includedir}/%{name} \
+  --with-fbdoc=%{_docdir}/%{name} \
+  --with-fbudf=%{_libdir}/%{name}/udf \
+  --with-fbsample=%{_docdir}/%{name}/sample \
+  --with-fbsample-db=%{_libdir}/%{name}/sample \
+  --with-fbhelp=%{_libdir}/%{name}/lib \
+  --with-fbintl=%{_libdir}/%{name}/intl \
+  --with-fbmisc=%{_datadir}/%{name}/misc \
+  --with-fbsecure-db=%{_localstatedir}/lib/%{name}/secdb \
+  --with-fbmsg=%{_libdir}/%{name}/lib \
+  --with-fblog=%{_localstatedir}/log/%{name} \
+  --with-fbglock=%{_localstatedir}/run/%{name} \
+  --with-fbplugins=%{_libdir}/%{name}/plugins
+
+make %{?_smp_mflags}
 cd gen
-sed "s@exit 1@echo ""# exit 1@" -i ./install/makeInstallImage.sh
-sed "s@chown@echo ""# chown@g" -i ./install/makeInstallImage.sh
-sed "s@chmod@echo ""# chmod@g" -i ./install/makeInstallImage.sh
-./install/makeInstallImage.sh
-
+make -f Makefile.install buildRoot
+chmod -R u+w buildroot%{_docdir}/%{name}
 
 %install
-# we wanted to setup both Classic and Superserver, we need to do all here
-rm -Rf %{buildroot}
-install -d %{buildroot}
-
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}
-mkdir -p %{buildroot}%{fbroot}/bin-superserver
-mkdir -p %{buildroot}%{fbroot}/bin-classic
-mkdir -p %{buildroot}%{_includedir}/%{name}
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}
-mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}%{fbroot}/UDF
-mkdir -p %{buildroot}%{fbroot}/intl
-mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data
-mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/system
-mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
-mkdir -p %{buildroot}%{_var}/run/%{name}
-touch %{buildroot}%{_var}/run/%{name}/fb_guard
-mkdir -p %{buildroot}%{fbroot}/plugins-superserver
-mkdir -p %{buildroot}%{fbroot}/plugins-classic
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-cp %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/
-mkdir -p %{buildroot}%{_initrddir} 
-mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_bindir}
-
-cd %{buildroot}
-rm -f %{_builddir}/%{pkgname}/gen/buildroot%{_sysconfdir}/%{name}/I*.txt
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{_sysconfdir}/%{name}/* %{buildroot}%{_sysconfdir}/%{name}
-cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/bin-classic/* %{buildroot}%{fbroot}/bin-classic
-cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_config %{buildroot}%{fbroot}/bin-classic/fb_config
-sed "s@-classic@-superserver@" %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_config > %{buildroot}%{fbroot}/bin-superserver/fb_config
-sed "s@-classic@@" %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_config > %{buildroot}%{_libdir}/fb_config
-sed -i '/plugins/d' %{buildroot}%{_libdir}/fb_config
-install -p -m 0755 %{SOURCE8} %{buildroot}%{_sbindir}/fb_config
-cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fbguard %{buildroot}%{_sbindir}/fbguard
-cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_inet_server %{buildroot}%{_sbindir}/fb_inet_server
-cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_lock_print %{buildroot}%{_sbindir}/fb_lock_print
-cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_smp_server %{buildroot}%{_sbindir}/fb_smp_server
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{_sbindir}/fbserver %{buildroot}%{_sbindir}/fbserver
-rm -f %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/bin-superserver/fb_inet_server
-rm -f %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/bin-superserver/fb_smp_server
-rm -f %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/bin-superserver/changeMultiConnectMode.sh
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/bin-superserver/* %{buildroot}%{fbroot}/bin-superserver
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{_includedir}/*.h %{buildroot}%{_includedir}
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{_includedir}/%{name}/* %{buildroot}%{_includedir}/%{name}
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{_sysconfdir}/%{name}/* %{buildroot}%{_sysconfdir}/%{name}
-rm -f %{buildroot}%{_sysconfdir}/%{name}/README
-rm -f %{buildroot}%{_sysconfdir}/%{name}/WhatsNew
-
-cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_libdir}/lib* %{buildroot}%{_libdir}
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{_localstatedir}/lib/%{name}/data/* %{buildroot}%{_localstatedir}/lib/%{name}/data
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{_localstatedir}/lib/%{name}/system/* %{buildroot}%{_localstatedir}/lib/%{name}/system
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/plugins-superserver/* %{buildroot}%{fbroot}/plugins-superserver
-cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/plugins-classic/* %{buildroot}%{fbroot}/plugins-classic
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/intl/fbintl %{buildroot}%{fbroot}/intl/fbintl
-cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/intl/fbintl.conf %{buildroot}%{_sysconfdir}/%{name}/fbintl.conf
-ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf
-
-cd %{buildroot}%{_libdir}
-ln -s libfbclient.so libgds.so
-ln -s libfbclient.so.%{major} libgds.so.0
-cd %{buildroot}
-
-echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log
-sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-
-install -p -m 644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}-classic\@.service
-install -p -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/%{name}-classic.socket
-
-install -p -m 644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{name}-superclassic.service
-install -p -m 644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_unitdir}/%{name}-superserver.service
-
-sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{_builddir}/%{pkgname}/doc/README.Fedora
-
-cd %{buildroot}
-ln -s %{fbroot}/bin/fbsvcmgr .%{_bindir}/fbsvcmgr
-ln -s %{fbroot}/bin/fbtracemgr .%{_bindir}/fbtracemgr
-ln -s %{fbroot}/bin/gbak .%{_bindir}/gbak
-ln -s %{fbroot}/bin/gdef .%{_bindir}/gdef
-ln -s %{fbroot}/bin/gfix .%{_bindir}/gfix
-ln -s %{fbroot}/bin/gpre .%{_bindir}/gpre
-ln -s %{fbroot}/bin/gsec .%{_bindir}/gsec
-ln -s %{fbroot}/bin/gsplit .%{_bindir}/gsplit
-ln -s %{fbroot}/bin/gstat .%{_bindir}/gstat-fb
-ln -s %{fbroot}/bin/isql .%{_bindir}/isql-fb
-ln -s %{fbroot}/bin/nbackup .%{_bindir}/nbackup
-ln -s %{fbroot}/bin/qli .%{_bindir}/qli
-
-# Remove lib64 rpaths
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libfbembed.so.%{major}
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libfbclient.so.%{major}
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgds.so.0
+chmod u+rw,a+rx gen/buildroot/usr/include/firebird/firebird/impl
+cp -r gen/buildroot/* ${RPM_BUILD_ROOT}/
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
+cp -v gen/install/misc/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/
+cd ${RPM_BUILD_ROOT}
+mkdir -p .%{_libdir}/%{name}/utils
+mv -v .%{_sbindir}/*.sh .%{_libdir}/%{name}/utils/
+mv -v .%{_sbindir}/fb_config .%{_libdir}/%{name}/utils/
+rm -vf .%{_includedir}/%{name}/perf.h
+rm -vf .%{_libdir}/libicu*.so
+rm -vf .%{_includedir}/*.h
+chmod -R u+w .%{_docdir}/%{name}
+rm -vf .%{_datadir}/%{name}/misc/firebird.init.*
+rm -vf .%{_datadir}/%{name}/misc/rc.config.firebird
+mv -v .%{_sysconfdir}/%{name}/README .%{_sysconfdir}/%{name}/WhatsNew \
+  .%{_docdir}/%{name}/
+mv -v .%{_sysconfdir}/%{name}/IDPLicense.txt .%{_docdir}/%{name}/
+mv -v .%{_sysconfdir}/%{name}/IPLicense.txt .%{_docdir}/%{name}/
 
 %clean
 rm -Rf %{buildroot}
 
-%post libfbclient -p /sbin/ldconfig
-
-%postun libfbclient -p /sbin/ldconfig
-
-%post libfbembed -p /sbin/ldconfig
-
-%postun libfbembed -p /sbin/ldconfig
-
-%post classic-common
-if [ "$(readlink %{fbroot}/bin 2> /dev/null)" \!= "%{fbroot}/bin-classic" ]; then 
- [ -e %{fbroot}/bin ] && rm -f %{fbroot}/bin
- ln -s %{fbroot}/bin{-classic,}
-fi
-
-%post classic
-%if 0%{?fedora}>=16
- [ -e %{_sysconfdir}/xinetd.d/%{name} ] && rm -f %{_sysconfdir}/xinetd.d/%{name}
-%endif
-%systemd_post firebird-classic.socket
-exit 0
-
-%preun classic
-%systemd_preun firebird-classic.socket
-exit 0
-
-%postun classic
-%systemd_postun_with_restart firebird-classic.socket
-
-%preun classic-common
-if [ $1 -eq 0 ]; then
- if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-classic" ]; then
-  rm -f %{fbroot}/bin
- fi
-fi
-
-%preun superclassic
-%systemd_preun firebird-superclassic.service
-
-%post superclassic
-%systemd_post firebird-superclassic.service
-
-%postun superclassic
-%systemd_postun_with_restart firebird-superclassic.service
-
-%post superserver
-if [ "$(readlink %{fbroot}/bin 2> /dev/null)" \!= "%{fbroot}/bin-superserver" ]; then 
- [ -e %{fbroot}/bin ] && rm -f %{fbroot}/bin
- ln -s %{fbroot}/bin{-superserver,}
-fi
-%systemd_post firebird-superserver.service
-
-%postun superserver
-%systemd_postun_with_restart firebird-superserver.service
-
-%preun superserver
-%systemd_preun firebird-superserver.service
-
-
-%pre 
-# Create the firebird group if it doesn't exist
-getent group %{name} || /usr/sbin/groupadd -r %{name} 
-getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/nologin -r %{name} 
-
-# Add gds_db to /etc/services if needed
-FileName=/etc/services
-newLine="gds_db 3050/tcp  # Firebird SQL Database Remote Protocol"
-oldLine=`grep "^gds_db" $FileName`
-if [ -z "$oldLine" ]; then
- echo $newLine >> $FileName
-fi
-
-
-%post 
-/sbin/ldconfig
-/bin/systemd-tmpfiles --create  %{_sysconfdir}/tmpfiles.d/firebird.conf
-
-%postun 
-/sbin/ldconfig
-
-%files 
-%defattr(0644,root,root,0755)
-%doc builds/install/misc/IDPLicense.txt
-%doc builds/install/misc/IPLicense.txt
-%doc doc/README.Fedora
-%defattr(0755,root,root,0755)
-%dir %{fbroot}
-%defattr(0644,root,root,0755)
-%dir %attr(0755,root,root) %{_localstatedir}/lib/%{name}
-%dir %attr(0770,%{name},%{name}) %{_localstatedir}/lib/%{name}/data
-%attr(0660,%{name},%{name}) %{_localstatedir}/lib/%{name}/data/employee.fdb
-%dir %{_localstatedir}/log/%{name}
-%dir %{fbroot}/intl
-%dir %{fbroot}/UDF
-%{fbroot}/UDF/*
+
+%files
+%{_bindir}/*
+%{_sbindir}/*
+%{_libdir}/%{name}/utils
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %attr (0600,%{name},%{name}) %{_localstatedir}/lib/%{name}/system/security2.fdb
-%{_localstatedir}/lib/%{name}/system/*.msg
-%{_localstatedir}/lib/%{name}/system/help.fdb
-%config(noreplace) %attr (0664,%{name},%{name}) %{_sysconfdir}/%{name}/fbintl.conf
-%config(noreplace) %attr (0664,%{name},%{name}) %{_sysconfdir}/%{name}/aliases.conf
-%config(noreplace) %attr (0664,%{name},%{name}) %{_sysconfdir}/%{name}/firebird.conf
-%config(noreplace) %attr (0664,%{name},%{name}) %{_sysconfdir}/%{name}/fbtrace.conf
-%{fbroot}/intl/fbintl.conf
-%config(noreplace) %attr(0664,%{name},%{name})  %{_localstatedir}/log/%{name}/%{name}.log
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/*.conf
 %{_libdir}/libib_util.so
-%defattr(0755,root,root,0750)
-%{fbroot}/intl/fbintl
-%defattr(0755,root,root,0755)
-%{_bindir}/*
-%{_sbindir}/fbguard
-%{_sbindir}/fb_lock_print
-%ghost %dir %attr(0775,%{name},%{name}) %{_var}/run/%{name}
-%ghost %attr(0644,%{name},%{name}) %{_var}/run/%{name}/fb_guard
-%dir %{_sysconfdir}/tmpfiles.d  
-%defattr(0644,root,root)
-%{_sysconfdir}/tmpfiles.d/firebird.conf  
+%dir %{_libdir}/%{name}
+%dir %{_datadir}/%{name}
+%{_libdir}/%{name}/lib
+%{_libdir}/%{name}/intl
+%{_datadir}/%{name}/misc
+%{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/udf
+%attr(755,root,root) /etc/init.d/firebird
+%{_docdir}/%{name}/IDPLicense.txt
+%{_docdir}/%{name}/IPLicense.txt
+
+%dir %{_localstatedir}/lib/%{name}
+%dir %{_localstatedir}/lib/%{name}/secdb
+%attr(0600,firebird,firebird) %config(noreplace) %{_localstatedir}/lib/%{name}/secdb/security3.fdb
+%dir %{_libdir}/%{name}/sample
+%attr(0600,firebird,firebird) %{_libdir}/%{name}/sample/*
+%attr(0750,firebird,firebird) %{_localstatedir}/log/%{name}
 
-%files doc
-%defattr(0644,root,root,0755)
-%doc gen/buildroot-classic%{_defaultdocdir}/%{name}
-%doc gen/buildroot-classic%{fbroot}/misc/intl.sql
-%doc gen/buildroot-classic%{fbroot}/misc/upgrade
-%doc gen/buildroot-classic%{_sysconfdir}/%{name}/README
-%doc gen/buildroot-classic%{_sysconfdir}/%{name}/WhatsNew
 
 %files devel
-%defattr(0644,root,root,0755)
-%dir %{_includedir}/%{name}
-%{_includedir}/*.h
-%{_includedir}/%{name}/*.h
-%{_libdir}/libfb*.so
-%{_libdir}/libgds.so
-%defattr(0755,root,root,0755)
-%{_libdir}/fb_config
-%{_sbindir}/fb_config
-
-%files filesystem
-%defattr(0644,root,root,0755)
-%doc doc/README.Fedora
-%defattr(0755,root,root,0755)
-%dir %{fbroot}
-
-
-%files libfbclient
-%defattr(0644,root,root,0755)
-%doc doc/license/IDPL.txt
-%doc doc/license/README.license.usage.txt
+%defattr(-,root,root)
+%{_includedir}/%{name}
+
+%files -n libfbclient2
+%defattr(-,root,root)
 %{_libdir}/libfbclient.so.*
-%{_libdir}/libgds.so.0
-
-
-%files libfbembed
-%defattr(0644,root,root,0755)
-%doc doc/license/IDPL.txt
-%doc doc/license/README.license.usage.txt
-%{_libdir}/libfbembed.so.*
-
-
-%files classic
-%defattr(0644,root,root,0755)
-%doc doc/license/IDPL.txt
-%doc doc/license/README.license.usage.txt
-%{_unitdir}/%{name}-classic*
-
-%files superclassic
-%defattr(0644,root,root,0755)
-%doc doc/license/IDPL.txt
-%doc doc/license/README.license.usage.txt
-%defattr(0755,root,root,0755)
-%{_unitdir}/%{name}-superclassic.service
-%{_sbindir}/fb_smp_server
-
-%files classic-common
-%dir %{fbroot}/bin-classic
-%dir %{fbroot}/plugins-classic
-%defattr(0755,root,root,0755)
-%{fbroot}/bin-classic/*
-%{fbroot}/plugins-classic/*
-%{_sbindir}/fb_inet_server
-
-
-%files superserver
-%defattr(0644,root,root,0755)
-%doc doc/license/IDPL.txt
-%doc doc/license/README.license.usage.txt
-%defattr(0644,root,root,0755)
-%dir %{fbroot}/bin-superserver
-%dir %{fbroot}/plugins-superserver
-%defattr(0755,root,root,0755)
-%{_unitdir}/%{name}-superserver.service
-%{fbroot}/bin-superserver/*
-%{fbroot}/plugins-superserver/*.so
-%{_sbindir}/fbserver
+
+%files -n libfbclient2-devel
+%defattr(-,root,root)
+%{_libdir}/libfbclient.so
+%{_libdir}/pkgconfig/fbclient.pc
+
+%files doc
+%{_docdir}/%{name}
+%exclude %{_docdir}/%{name}/sample
+%exclude %{_docdir}/%{name}/IDPLicense.txt
+%exclude %{_docdir}/%{name}/IPLicense.txt
 
 
 %changelog
-* Wed Feb 24 2016 Philippe Makowski <makowski@fedoraproject.org> - 
+* Fri Feb 26 2016 Philippe Makowski <makowski@fedoraproject.org> - 3.0-1.20160226git6127d1e8
+- Update to git: 6127d1e8
+
+* Wed Feb 24 2016 Philippe Makowski <makowski@fedoraproject.org> -
 -  first version for Epel7