diff --git a/bogofilter-wordlist-x/bogofilter-wordlist.spec.in b/bogofilter-wordlist-x/bogofilter-wordlist.spec.in index b9e150285..4c3981efe 100644 --- a/bogofilter-wordlist-x/bogofilter-wordlist.spec.in +++ b/bogofilter-wordlist-x/bogofilter-wordlist.spec.in @@ -29,6 +29,7 @@ URL: http://www.indimail.org Source0: http://downloads.sourceforge.net/indimail/%{name}-%{version}.tar.gz %if %build_on_obs == 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?suse_version} BuildRequires: -post-build-checks #!BuildIgnore: post-build-checks @@ -47,16 +48,40 @@ bogofilter-wordlist provides SPAM database for bogofilter in Berkeley DB format %setup -q %build +( +echo "---------------- INFORMATION ------------------------" +echo target %_target +echo target_alias %_target_alias +echo target_cpu %_target_cpu +echo target_os %_target_os +echo target_vendor %_target_vendor +echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} lib=%{_lib} libdir=%{_libdir} +echo "------------------------------------------------------" +) > %{name}-rpm.info +( +echo "NAME=%{name}" +echo "Description=\"bogofilter-wordlist Package\"" +echo "BOGOFILTER_WORDLIST_version=%{version}-%{release}" +echo "ID=%{name}" +echo "HOME_URL=\"https://github.com/mbhangui/indimail-virtualdomains\"" +echo "PACKAGE_BUGREPORT=\"'@email@'\"" +) > %{name}-release %configure --sysconfdir=%{sysconfdir} -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -[ "$RPM_BUILD_ROOT" != "/" ] && /bin/rm -fr $RPM_BUILD_ROOT -ID=$(id -u) +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} %make_install +%{__mkdir_p} %{buildroot}%{sysconfdir} +install -m 0644 %{name}-rpm.info %{buildroot}%{sysconfdir}/%{name}-rpm.info +install -m 0644 %{name}-release %{buildroot}%{sysconfdir}/%{name}-release +/bin/rm -f %{name}-rpm.info %{name}-release +/bin/rm -f %{name}-rpm.info %files %attr(0644,-,-) %config(noreplace) %{sysconfdir}/wordlist.db +%attr(644,root,root) %{sysconfdir}/%{name}-release +%attr(644,root,root) %{sysconfdir}/%{name}-rpm.info %doc diff --git a/indimail-access/indimail-access.spec.in b/indimail-access/indimail-access.spec.in index 9957f3788..cd24f7d92 100644 --- a/indimail-access/indimail-access.spec.in +++ b/indimail-access/indimail-access.spec.in @@ -135,10 +135,6 @@ Conflicts: indimail < 3.2 %if %build_on_obs == 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif -# -# IndiMail is choosy and runs on reliable OS only -# -Excludeos: windows %description indimail-access package provides IMAP, POP3 and fetchmail @@ -237,6 +233,7 @@ if [ -d fetchmail-%{fetchmail_version} ] ; then fi %install +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} cd %{name}-%{version} for i in fetchmail-%{fetchmail_version} courier-imap-%{courier_version} do @@ -319,8 +316,8 @@ done %dir %attr(755,root,root) %{mandir}/man7 %dir %attr(755,root,root) %{mandir}/man8 %endif -%attr(444,root,root) %config(noreplace) %{sysconfdir}/%{name}-release -%attr(444,root,root) %config(noreplace) %{sysconfdir}/%{name}-rpm.info +%attr(444,root,root) %{sysconfdir}/%{name}-release +%attr(444,root,root) %{sysconfdir}/%{name}-rpm.info %dir %attr(755,root,root) %{shareddir}/locale %ghost %config(noreplace,missingok) %{sysconfdir}/fetchmailrc diff --git a/indimail-auth/indimail-auth.spec.in b/indimail-auth/indimail-auth.spec.in index 0bb42e91b..3ba72c14a 100644 --- a/indimail-auth/indimail-auth.spec.in +++ b/indimail-auth/indimail-auth.spec.in @@ -101,12 +101,8 @@ Requires(postun): shadow-utils %endif %if %build_on_obs == 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -# -# IndiMail is choosy and runs on reliable OS only -# -Excludeos: windows %description indimail-auth provides nssd daemon to provide name service switch @@ -147,7 +143,6 @@ echo target_cpu %_target_cpu echo target_os %_target_os echo target_vendor %_target_vendor echo PAM Module dir %{pam_moduledir} -echo Project %{_project} echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} lib=%{_lib} libdir=%{_libdir} echo "------------------------------------------------------" ) > %{name}-rpm.info @@ -201,9 +196,8 @@ if [ pam-multi-%{pam_multi_version} ] ; then fi %install +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} cd %{name}-%{version} -%{__mkdir_p} $RPM_BUILD_ROOT -%{__mkdir_p} %{buildroot}%{shareddir}/doc for i in nssd-%{nssd_version} pam-multi-%{pam_multi_version} do if [ -d $i ] ; then @@ -264,8 +258,8 @@ chmod -R 755 %{buildroot}/%{pam_moduledir} %endif %ghost %config(noreplace,missingok) %{sysconfdir}/nssd.conf -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-rpm.info -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-release +%attr(644,root,root) %{sysconfdir}/%{name}-rpm.info +%attr(644,root,root) %{sysconfdir}/%{name}-release %attr(755,root,root) %{_prefix}/sbin/nssd %attr(755,root,root) %{libexecdir}/check_getpw @@ -310,13 +304,6 @@ chmod -R 755 %{buildroot}/%{pam_moduledir} %{_builddir}/elfbins.list %endif -%verifyscript -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi - ### SCRIPTLET ############################################################################### %pretrans if [ -d /run ] ; then @@ -338,11 +325,6 @@ fi ### SCRIPTLET ############################################################################### %post argv1=$1 -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi if [ -d /run ] ; then rundir=/run/svscan elif [ -d /var/run ] ; then @@ -412,11 +394,6 @@ fi ### SCRIPTLET ############################################################################### %postun argv1=$1 -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi if [ -z "$argv1" ] ; then argv1=0 fi diff --git a/indimail-spamfilter-x/indimail-spamfilter.spec.in b/indimail-spamfilter-x/indimail-spamfilter.spec.in index 80b233862..2731598f0 100644 --- a/indimail-spamfilter-x/indimail-spamfilter.spec.in +++ b/indimail-spamfilter-x/indimail-spamfilter.spec.in @@ -101,7 +101,7 @@ Requires: indimail-mta Conflicts: indimail < 3.2 %if %build_on_obs == 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif %description @@ -123,7 +123,6 @@ the word lists. %setup -q %build -ID=$(id -u) ( echo "---------------- INFORMATION ------------------------" echo target %_target @@ -131,12 +130,6 @@ echo target_alias %_target_alias echo target_cpu %_target_cpu echo target_os %_target_os echo target_vendor %_target_vendor -%if 0%{?fedora_version} > 30 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?centos_ver} > 7 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 -echo pythondir %{python3_sitelib} -%else -echo pythondir %{pythondir} -%endif -echo Project %{_project} echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} echo "------------------------------------------------------" ) > %{name}-rpm.info @@ -164,7 +157,7 @@ HOME='.';export HOME ) %install -ID=$(id -u) +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} %{__make} -s %{?_smp_mflags} %if %{defined nodebug} %{__make} -s %{?_smp_mflags} DESTDIR=%{buildroot} install-strip @@ -216,11 +209,11 @@ $TOUCH %{buildroot}%{sysconfdir}/bogofilter.cf %dir %attr(755,root,root) %{mandir} %dir %attr(755,root,root) %{mandir}/man1 %endif -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-release -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-rpm.info -%ghost %config(noreplace,missingok) %{sysconfdir}/bogofilter.cf -%attr(644,root,root) %config(noreplace) %{sysconfdir}/bogofilter.cf.example +%attr(644,root,root) %{sysconfdir}/%{name}-release +%attr(644,root,root) %{sysconfdir}/%{name}-rpm.info %attr(644,root,root) %config(noreplace) %{sysconfdir}/bogofilter.perms +%ghost %config(noreplace,missingok) %{sysconfdir}/bogofilter.cf +%attr(644,root,root) %{sysconfdir}/bogofilter.cf.example %if 0%{?suse_version} >= 1120 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/permissions.d/%{name}-permissions @@ -264,11 +257,6 @@ $TOUCH %{buildroot}%{sysconfdir}/bogofilter.cf ### SCRIPTLET ############################################################################### %verifyscript -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi %if 0%{?suse_version} >= 1120 %verify_permissions -e %{_prefix}/bin/bogofilter @@ -277,11 +265,6 @@ fi ### SCRIPTLET ############################################################################### %post argv1=$1 -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi if [ -x /bin/touch ] ; then TOUCH=/bin/touch elif [ -x /usr/bin/touch ] ; then @@ -416,11 +399,6 @@ fi ### SCRIPTLET ############################################################################### %postun argv1=$1 -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi if [ -z "$argv1" ] ; then argv1=0 fi diff --git a/indimail-utils/indimail-utils.spec.in b/indimail-utils/indimail-utils.spec.in index ce3dc50da..6d0a7c1ed 100644 --- a/indimail-utils/indimail-utils.spec.in +++ b/indimail-utils/indimail-utils.spec.in @@ -94,12 +94,8 @@ Requires: coreutils grep /bin/sh glibc Conflicts: indimail < 3.2 %if %build_on_obs == 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -# -# IndiMail is choosy and runs on reliable OS only -# -Excludeos: windows %description indimail-utils provides a package consisting of utilities like @@ -139,7 +135,6 @@ echo target_alias %_target_alias echo target_cpu %_target_cpu echo target_os %_target_os echo target_vendor %_target_vendor -echo Project %{_project} echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} lib=%{_lib} libdir=%{_libdir} echo "------------------------------------------------------" ) > %{name}-rpm.info @@ -171,8 +166,9 @@ do done %install +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} cd %{name}-%{version} -%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix} +%{__mkdir_p} %{buildroot}%{_prefix} for i in altermime-%{altermime_version} ripmime-%{ripmime_version} \ fortune-%{fortune_version} mpack-%{mpack_version} flash-%{flash_version} do @@ -242,8 +238,8 @@ fi %attr(644,root,root) %config(noreplace) %{sysconfdir}/system.rc %attr(644,root,root) %config(noreplace) %{sysconfdir}/system.menu %attr(644,root,root) %config(noreplace) %{sysconfdir}/system.module -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-release -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-rpm.info +%attr(644,root,root) %{sysconfdir}/%{name}-release +%attr(644,root,root) %{sysconfdir}/%{name}-rpm.info # indimail binaries %attr(755,root,root) %{_prefix}/bin/altermime @@ -413,11 +409,6 @@ fi ### SCRIPTLET ############################################################################### %verifyscript -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi # fix changelog for openSUSE buildservice %changelog diff --git a/indimail-x/indimail.spec.in b/indimail-x/indimail.spec.in index 60296bb24..344579076 100644 --- a/indimail-x/indimail.spec.in +++ b/indimail-x/indimail.spec.in @@ -184,12 +184,8 @@ Requires: policycoreutils-python Requires: indimail-access %if %build_on_obs == 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -# -# IndiMail is choosy and runs on reliable OS only -# -Excludeos: windows %description IndiMail is a messaging platform providing multi-cluster domain support. @@ -236,7 +232,6 @@ echo target_alias %_target_alias echo target_cpu %_target_cpu echo target_os %_target_os echo target_vendor %_target_vendor -echo Project %{_project} echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} lib=%{_lib} libdir=%{_libdir} echo "------------------------------------------------------" ) > %{name}-rpm.info @@ -269,6 +264,7 @@ fi --enable-default-domain=${default_domain} `%{__cat} config/indimail.opts` %install +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} %if 0%{?suse_version} >= 1120 %if 0%{?build_cflags:1} CFLAGS="%{build_cflags} -fPIC -fno-lto" @@ -434,14 +430,14 @@ done # %ghost %attr(0644,root,root) %{sysconfdir}/indimail.pp %ghost %attr(0644,root,root) %{sysconfdir}/indimail.mod +%attr(444,root,root) %{sysconfdir}/indimail.perms +%attr(444,root,root) %{sysconfdir}/%{name}-release +%attr(444,root,root) %{sysconfdir}/%{name}-rpm.info %attr(444,root,root) %config(noreplace) %{sysconfdir}/cronlist.i %attr(444,root,root) %config(noreplace) %{sysconfdir}/indimail.mrtg.cfg %attr(444,root,root) %config(noreplace) %{sysconfdir}/headerlist %attr(444,root,root) %config(noreplace) %{sysconfdir}/indimail.settings -%attr(444,root,root) %config(noreplace) %{sysconfdir}/%{name}-release -%attr(444,root,root) %config(noreplace) %{sysconfdir}/%{name}-rpm.info -%attr(444,root,root) %config(noreplace) %{sysconfdir}/indimail.perms %attr(444,root,root) %config(noreplace) %{sysconfdir}/indimail.schema %attr(644,root,root) %config(noreplace) %{sysconfdir}/indimail.te @@ -869,11 +865,6 @@ done ### SCRIPTLET ############################################################################### %verifyscript -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi %{_prefix}/sbin/svctool --check-install --servicedir=%{servicedir} \ --qbase=%{qbase} --qcount=%{qcount} --qstart=1 diff --git a/indium-x/indium.spec.in b/indium-x/indium.spec.in index cf67a7171..d7f530f69 100644 --- a/indium-x/indium.spec.in +++ b/indium-x/indium.spec.in @@ -1,6 +1,6 @@ # # -# $Id: indium.spec.in,v 1.28 2021-03-14 21:35:05+05:30 Cprogrammer Exp mbhangui $ +# $Id: indium.spec.in,v 1.29 2023-05-14 09:49:08+05:30 Cprogrammer Exp mbhangui $ %undefine _missing_build_ids_terminate_build %global _unpackaged_files_terminate_build 1 @@ -37,12 +37,6 @@ %endif %define nobwidget 1 -%if 0 -%if %{undefined nodebug} -%global buildsubdir "" -%endif -%endif - %if %build_on_obs == 1 %global packager @email@ %endif @@ -58,8 +52,8 @@ License: GPL-3.0+ License: GPLv3 %endif Group: System Environment/Base -Source1: http://downloads.sourceforge.net/indimail/%{name}-%{version}.tar.gz -Source2: %{name}-rpmlintrc +Source0: http://downloads.sourceforge.net/indimail/%{name}-%{version}.tar.gz +Source1: %{name}-rpmlintrc URL: https://github.com/mbhangui/indimail-virtualdomains AutoReq: Yes @@ -79,8 +73,9 @@ BuildRequires: -post-build-checks Requires: coreutils grep /bin/sh glibc /usr/sbin/useradd /usr/sbin/groupadd Requires: bwidget tcl tk procps /usr/bin/awk indimail > 1.6 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Excludeos: windows +%if %build_on_obs == 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%endif %description Indium provides a GUI for administering IndiMail and configuring @@ -97,40 +92,19 @@ Fetchmail, Indium also provides Management of Virtual domains. %prep -echo "---------------- INFORMATION ------------------------" -echo target %_target -echo target_alias %_target_alias -echo target_cpu %_target_cpu -echo target_os %_target_os -echo target_vendor %_target_vendor -echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} Dist %dist disttag %disttag libs %{_lib} %{_libdir} -echo "------------------------------------------------------" - -for i in %{name}-%{version} -do -( -if [ -d $i ] ; then - /bin/rm -rf $i -fi -if [ -f ../SOURCES/$i.tar.gz ] ; then - gunzip -c ../SOURCES/$i.tar.gz |tar xf - -elif [ -f ../SOURCES/$i.tar.bz2 ] ; then - bzip2 -d -c ../SOURCES/$i.tar.bz2 |tar xf - -else - echo "No Source Archive for $i" - exit 1 -fi -if [ -d $i ] ; then - if [ -f %{name}-%{version}/patches/$i.patch ] ; then - # Copy for the SRPM - /bin/cp %{name}-%{version}/patches/$i.patch ../SOURCES - fi -fi -) -done +%setup -q %build -ID=$(id -u) +( +echo "---------------- INFORMATION ------------------------" +echo target %_target +echo target_alias %_target_alias +echo target_cpu %_target_cpu +echo target_os %_target_os +echo target_vendor %_target_vendor +echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} lib=%{_lib} libdir=%{_libdir} +echo "------------------------------------------------------" +) > %{name}-rpm.info #### Stupid Mandriva ###################### %if 0%{?mandriva_version} > 2009 @@ -143,28 +117,19 @@ ID=$(id -u) %endif %endif -cd %{name}-%{version} %configure --prefix=%{_prefix} --libdir=%{_libdir} \ --libexecdir=%{libexecdir} --sysconfdir=%{sysconfdir} \ --enable-shareddir=%{shareddir} \ --mandir=%{mandir} --enable-mysqlprefix=/usr +%{__make} %{?_smp_mflags} %install -[ "$RPM_BUILD_ROOT" != "/" ] && /bin/rm -fr $RPM_BUILD_ROOT -ID=$(id -u) -for i in %{name}-%{version} -do -if [ -d $i ] ; then - cd $i - %{__make} -s %{?_smp_mflags} +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} %if %{defined nodebug} - %{__make} -s %{?_smp_mflags} DESTDIR=%{buildroot} install-strip + %{__make} %{?_smp_mflags} DESTDIR=%{buildroot} install-strip %else - %{__make} -s %{?_smp_mflags} DESTDIR=%{buildroot} install + %{__make} %{?_smp_mflags} DESTDIR=%{buildroot} install %endif - cd .. -fi -done for i in fbsql tai64 do /bin/rm -f %{buildroot}%{_libdir}/lib"$i".la @@ -177,7 +142,6 @@ if [ -f /usr/lib/tclConfig.sh ] ; then elif [ -f /usr/lib64/tclConfig.sh ] ; then . /usr/lib64/tclConfig.sh fi -cd %{name}-%{version} if [ $TCL_VERSION -ne %{tcl_version} ] ; then echo "tcl version mismatch $TCL_VERSION != %{tcl_version}" exit 1 @@ -191,6 +155,10 @@ if [ -x /usr/bin/chrpath ] ; then /usr/bin/chrpath -d %{buildroot}%{libexecdir}/pwhelper fi %{__rm} -f %{buildroot}%{_libdir}/*.so +%{__mkdir_p} %{buildroot}%{sysconfdir} +install -m 0644 %{name}-rpm.info %{buildroot}%{sysconfdir}/%{name}-rpm.info +install -m 0644 %{name}-release %{buildroot}%{sysconfdir}/%{name}-release +/bin/rm -f %{name}-rpm.info %{name}-release %files %defattr(-, root, root,-) @@ -452,7 +420,8 @@ fi %attr(644,root,root) %config(noreplace,missingok) %{sysconfdir}/default.profile %attr(644,root,root) %config(noreplace,missingok) %{sysconfdir}/filemanrc %attr(644,root,root) %config(noreplace,missingok) %{sysconfdir}/termdefs.txt -%attr(644,root,root) %config(noreplace) %{sysconfdir}/indium-release +%attr(644,root,root) %{sysconfdir}/%{name}-release +%attr(644,root,root) %{sysconfdir}/%{name}-rpm.info %clean %{__rm} -rf %{buildroot} diff --git a/ircube-x/ircube.spec.in b/ircube-x/ircube.spec.in index e58579a23..80d6978c4 100644 --- a/ircube-x/ircube.spec.in +++ b/ircube-x/ircube.spec.in @@ -2,7 +2,9 @@ # %undefine _missing_build_ids_terminate_build %global _unpackaged_files_terminate_build 1 +%if %{defined nodebug} %global debug_package %{nil} +%endif %if %{defined _project} # define if building on openSUSE build service @@ -59,10 +61,12 @@ BuildRequires: -post-build-checks %endif ############################################################################## -BuildRequires: gcc gcc-c++ make autoconf automake libtool pkgconfig +BuildRequires: gcc make autoconf automake BuildRequires: coreutils Requires: iwebadmin coreutils sed Requires: indimail >= 2.0 indimail-mta >= 2.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch %description A collection of plugins for RoundCube Mail @@ -90,11 +94,39 @@ works if iwebadmin is in English. %setup -q %build +( +echo "---------------- INFORMATION ------------------------" +echo target %_target +echo target_alias %_target_alias +echo target_cpu %_target_cpu +echo target_os %_target_os +echo target_vendor %_target_vendor +echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} lib=%{_lib} libdir=%{_libdir} +echo "------------------------------------------------------" +) > %{name}-rpm.info +( +echo "NAME=%{name}" +echo "Description=\"ircube Package\"" +echo "IRCUBE_version=%{version}-%{release}" +echo "ID=%{name}" +echo "HOME_URL=\"https://github.com/mbhangui/indimail-virtualdomains\"" +echo "PACKAGE_BUGREPORT=\"'@email@'\"" +) > %{name}-release %configure --prefix=%{_prefix} --libexecdir=%{_prefix}/libexec/indimail --enable-plugindir=%{pluginbase} -make +%{__make} %{?_smp_mflags} %install -%make_install +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} +%if %{defined nodebug} +%{__make} -s DESTDIR=%{buildroot} install-strip +%else +%{__make} -s DESTDIR=%{buildroot} install +%endif +%{__mkdir_p} %{buildroot}%{pluginbase}/%{name} +install -m 0644 %{name}-rpm.info %{buildroot}%{pluginbase}/%{name}/%{name}-rpm.info +install -m 0644 %{name}-release %{buildroot}%{pluginbase}/%{name}/%{name}-release +/bin/rm -f %{name}-rpm.info %{name}-release +/bin/rm -f %{name}-rpm.info %files %attr(0755,root,root) %{libexecdir}/bogo-learn @@ -149,28 +181,28 @@ make %dir %attr(0755,root,root) %{pluginbase}/plugins/sauserprefs/lib/Roundcube %attr(0644,root,root) %{pluginbase}/plugins/sauserprefs/lib/Roundcube/rcube_sauserprefs_storage_sql.php %attr(0644,root,root) %{pluginbase}/plugins/sauserprefs/sauserprefs.php -%dir %attr(0775,root,root) %{pluginbase}/plugins/iwebadmin +%dir %attr(0755,root,root) %{pluginbase}/plugins/iwebadmin %attr(0664,root,root) %{pluginbase}/plugins/iwebadmin/config.inc.php %attr(0664,root,root) %{pluginbase}/plugins/iwebadmin/iwebadmin.php %attr(0664,root,root) %{pluginbase}/plugins/iwebadmin/README.md %attr(0664,root,root) %{pluginbase}/plugins/iwebadmin/onvacation.js -%dir %attr(0775,root,root) %{pluginbase}/plugins/iwebadmin/localization +%dir %attr(0755,root,root) %{pluginbase}/plugins/iwebadmin/localization %attr(0664,root,root) %{pluginbase}/plugins/iwebadmin/localization/pt_BR.inc %attr(0664,root,root) %{pluginbase}/plugins/iwebadmin/localization/en_US.inc %attr(0664,root,root) %{pluginbase}/plugins/iwebadmin/config.inc.php.dist %attr(0664,root,root) %{pluginbase}/plugins/iwebadmin/ChangeLog %dir %attr(0755,root,root) %{pluginbase}/plugins/markasjunk2 %dir %attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/drivers -%attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/drivers/cmd_learn.php -%attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/drivers/sa_blacklist.php -%attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/drivers/sa_detach.php -%attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/drivers/amavis_blacklist.php -%attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/drivers/edit_headers.php -%attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/drivers/dir_learn.php -%attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/drivers/email_learn.php +%attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/drivers/cmd_learn.php +%attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/drivers/sa_blacklist.php +%attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/drivers/sa_detach.php +%attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/drivers/amavis_blacklist.php +%attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/drivers/edit_headers.php +%attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/drivers/dir_learn.php +%attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/drivers/email_learn.php %attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/composer.json %attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/config.inc.php -%attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/markasjunk2.php +%attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/markasjunk2.php %attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/README.md %dir %attr(0755,root,root) %{pluginbase}/plugins/markasjunk2/localization %attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/localization/pl_PL.inc @@ -211,6 +243,8 @@ make %attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/config.inc.php.dist %attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/markasjunk2.js %attr(0644,root,root) %{pluginbase}/plugins/markasjunk2/CHANGELOG +%attr(644,root,root) %{pluginbase}/%{name}/%{name}-release +%attr(644,root,root) %{pluginbase}/%{name}/%{name}-rpm.info %doc %{_prefix}/share/indimail/doc/README-ircube.md %doc %{_prefix}/share/indimail/doc/COPYING.ircube diff --git a/iwebadmin-x/iwebadmin.spec.in b/iwebadmin-x/iwebadmin.spec.in index 6ce88e1c8..4408d46a5 100644 --- a/iwebadmin-x/iwebadmin.spec.in +++ b/iwebadmin-x/iwebadmin.spec.in @@ -76,9 +76,8 @@ Requires: coreutils grep /bin/sh glibc /usr/sbin/useradd /usr/sbin/groupadd Requires: procps /usr/bin/awk indimail > 1.6 Requires: ezmlm-idx > 7.2 %if %build_on_obs == 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -Excludeos: windows %description iwebadmin provides a Web front-end for administering IndiMail Users @@ -117,10 +116,10 @@ echo "------------------------------------------------------" --enable-cgibindir=@cgibindir@ \ --enable-imagedir=@imagedir@ \ --enable-htmllibdir=@htmllibdir@ +%{__make} -s %{?_smp_mflags} %install -[ "$RPM_BUILD_ROOT" != "/" ] && /bin/rm -fr $RPM_BUILD_ROOT -%{__make} -s %{?_smp_mflags} +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} %if %{defined nodebug} %{__make} -s %{?_smp_mflags} DESTDIR=%{buildroot} install-strip %else @@ -136,6 +135,7 @@ install -m 644 %{S:3} %{buildroot}%{_sysconfdir}/permissions.d/%{name}-permissio %endif %{__mkdir_p} %{buildroot}%{sysconfdir} install -m 0644 %{name}-rpm.info %{buildroot}%{sysconfdir}/%{name}-rpm.info +/bin/rm -f %{name}-rpm.info %if %{undefined nodebug} /bin/chmod -R 755 %{buildroot}@cgibindir@ @@ -148,11 +148,11 @@ find %{buildroot}%{mandir} -type f -exec gzip -q {} \; %dir %attr(755,root,qmail) %{_prefix} %endif -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-release -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-rpm.info +%attr(644,root,root) %{sysconfdir}/%{name}-release +%attr(644,root,root) %{sysconfdir}/%{name}-rpm.info +%attr(644,root,root) %{sysconfdir}/%{name}.perms %attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-conf %attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}-hooks -%attr(644,root,root) %config(noreplace) %{sysconfdir}/%{name}.perms %if %noperms == 0 %if 0%{?suse_version} >= 1120 diff --git a/logalert-x/logalert.spec.in b/logalert-x/logalert.spec.in index 2069ad928..7a38783bc 100644 --- a/logalert-x/logalert.spec.in +++ b/logalert-x/logalert.spec.in @@ -56,10 +56,10 @@ BuildRequires: flex coreutils bison %if %build_on_obs == 1 %define packager @email@ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif Requires: coreutils grep /bin/sh glibc -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description logalert is a logfile monitoring tool which executes a specific action @@ -84,7 +84,6 @@ echo target_alias %_target_alias echo target_cpu %_target_cpu echo target_os %_target_os echo target_vendor %_target_vendor -echo Project %{_project} echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} lib=%{_lib} libdir=%{_libdir} echo "------------------------------------------------------" ) > %{name}-rpm.info @@ -92,14 +91,14 @@ echo "------------------------------------------------------" --sysconfdir=%{sysconfdir} \ --mandir=%{mandir} \ --datarootdir=%{_prefix}/share/indimail +%{__make} %{?_smp_mflags} %install -[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -fr $RPM_BUILD_ROOT -%{__make} -s DESTDIR=%{buildroot} +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} %if %{defined nodebug} -%{__make} -s DESTDIR=%{buildroot} install-strip +%{__make} DESTDIR=%{buildroot} install-strip %else -%{__make} -s DESTDIR=%{buildroot} install +%{__make} DESTDIR=%{buildroot} install %endif install -m 0644 %{name}-rpm.info %{buildroot}%{sysconfdir}/%{name}-rpm.info /bin/rm -f %{name}-rpm.info @@ -114,9 +113,9 @@ find %{buildroot}%{mandir} -type f -exec gzip -q {} \; %attr(0755,root,root) %{_prefix}/bin/showbytes %attr(0755,root,root) %{_prefix}/sbin/rpclog %attr(0755,root,root) %{_prefix}/sbin/logsrv -%attr(0644,root,root) %config(noreplace) %{sysconfdir}/logalert.perms -%attr(0444,root,root) %config(noreplace) %{sysconfdir}/%{name}-release -%attr(0444,root,root) %config(noreplace) %{sysconfdir}/%{name}-rpm.info +%attr(0644,root,root) %{sysconfdir}/logalert.perms +%attr(0444,root,root) %{sysconfdir}/%{name}-release +%attr(0444,root,root) %{sysconfdir}/%{name}-rpm.info %doc %attr(0644,root,root) %{_prefix}/share/indimail/doc/logalert/LICENSE %doc %attr(0644,root,root) %{_prefix}/share/indimail/doc/logalert/README.md diff --git a/pam-multi-x/pam-multi.spec.in b/pam-multi-x/pam-multi.spec.in index 90b5c9fce..f32d995fa 100644 --- a/pam-multi-x/pam-multi.spec.in +++ b/pam-multi-x/pam-multi.spec.in @@ -3,14 +3,16 @@ # %undefine _missing_build_ids_terminate_build %define _unpackaged_files_terminate_build 1 -%if 0%{?opensuse_bs} -# define to 1 if building on openSUSE build service -%define build_on_obs 1 + +%if %{defined _project} +# define if building on openSUSE build service +%global build_on_obs 1 +%global build_cflags "-DOBS_BUILD %{build_cflags}" %else -%define build_on_obs 0 +%define _project local +%global build_on_obs 0 +%global _hardened_build 1 %endif -%define _prefix @indimaildir@ -%define security_dir @moduledir@ %if %{defined nodebug} %global debug_package %{nil} @@ -26,6 +28,15 @@ Release: 1 %endif License: GPLv3 Group: System Environment/Base +%global _prefix @prefix@ +%global security_dir @moduledir@ +%global mysqlPrefix @mysql_prefix@ +%global controldir @controldir@ +%global shareddir @datarootdir@ +%global mandir %{_prefix}/share/man +%global pam_confdir @pam_confdir@ +%global mysqlSocket /var/run/mysqld/mysqld.sock +%global defaultDomain @defaultdomain@ Source: http://downloads.sourceforge.net/indimail/%{name}-%{version}.tar.gz URL: http://www.indimail.org @@ -44,7 +55,9 @@ BuildRequires: -post-build-checks #!BuildIgnore: post-build-checks %endif Requires: pam -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%if %build_on_obs == 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%endif %description A PAM-module for authentication against custom databases. It helps to to @@ -63,31 +76,55 @@ echo "------------------------------------------------------" %setup -n %{name}-%{version} %build -ID=$(id -u) -%configure --prefix=%{_prefix} --enable-moduledir=%{security_dir} +%if %build_on_obs == 0 + if [ -x /usr/bin/uname -o -x /bin/uname ] ; then + default_domain=$(echo $([ -n "$HOSTNAME" ] && echo "$HOSTNAME" || uname -n) | sed 's/^\([^\.]*\)\.\([^\.]*\)\./\2\./') + else + default_domain=$([ -n "$HOSTNAME" ] && echo "$HOSTNAME" | sed 's/^\([^\.]*\)\.\([^\.]*\)\./\2\./' || echo %{defaultDomain}) + fi +%else + default_domain=%{defaultDomain} +%endif +%configure --prefix=%{_prefix} --enable-moduledir=%{security_dir} \ + --mandir=%{mandir} \ + --enable-mysqlprefix=%{mysqlPrefix} \ + --datarootdir=%{_prefix}/share/indimail \ + --enable-controldir=%{controldir} \ + --enable-pamconfdir=%{pam_confdir} \ + --enable-dlload-mysql=yes \ + --enable-default-domain=%{default_domain} %{__make} %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} %if %{defined nodebug} -%{__make} DESTDIR="$RPM_BUILD_ROOT" install-strip +%{__make} DESTDIR="%{buildroot}" install-strip %else -%{__make} DESTDIR="$RPM_BUILD_ROOT" install +%{__make} DESTDIR="%{buildroot}" install %endif -/bin/rm -f "$RPM_BUILD_ROOT"%{security_dir}/*.la -/bin/rm -f "$RPM_BUILD_ROOT"%{security_dir}/*a +/bin/rm -f "%{buildroot}"%{security_dir}/*.la +/bin/rm -f "%{buildroot}"%{security_dir}/*a if [ -x /usr/bin/chrpath ] ; then /usr/bin/chrpath -d %{buildroot}%{security_dir}/pam-multi.so /usr/bin/chrpath -d %{buildroot}%{_prefix}/sbin/pam-checkpwd fi %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" %{__make} clean %files %defattr(-,root,root) %attr(555,root,root) %{_prefix}/sbin/pam-checkpwd +%attr(644,root,root) %config(noreplace) %{pam_confdir}/pam-multi +%attr(644,root,root) %config(noreplace) %{pam_confdir}/pop3 +%attr(644,root,root) %config(noreplace) %{pam_confdir}/imap %attr(755,root,root) %{security_dir}/pam-multi.so -%attr(644,root,root) %{_prefix}/man/man?/* -%docdir %{_prefix}/man +%if %build_on_obs == 0 +%license %attr(644,root,root) %{shareddir}/doc/COPYING-pam-multi +%else +%attr(644,root,root) %{shareddir}/doc/COPYING-pam-multi +%endif +%attr(644,root,root) %{shareddir}/doc/AUTHORS-pam-multi +%attr(644,root,root) %{shareddir}/doc/README-pam-multi.md +%docdir %{mandir} +%attr(644,root,root) %{mandir}/man8/* diff --git a/procmail-x/procmail.spec.in b/procmail-x/procmail.spec.in index 586da5d52..522b6aea3 100644 --- a/procmail-x/procmail.spec.in +++ b/procmail-x/procmail.spec.in @@ -77,7 +77,9 @@ URL: http://www.indimail.org BuildRequires: coreutils Requires: coreutils grep /bin/sh /usr/bin/id glibc openssl -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%if %build_on_obs == 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%endif %description Most mail servers such as sendmail need to have a local delivery agent. @@ -89,11 +91,29 @@ incoming mail automatically. SmartList also needs procmail to operate. %setup -q %build +( +echo "---------------- INFORMATION ------------------------" +echo target %_target +echo target_alias %_target_alias +echo target_cpu %_target_cpu +echo target_os %_target_os +echo target_vendor %_target_vendor +echo Building %{name}-%{version}-%{release} Build %{_build} OS %{_os} lib=%{_lib} libdir=%{_libdir} +echo "------------------------------------------------------" +) > %{name}-rpm.info +( +echo "NAME=%{name}" +echo "Description=\"procmail Package\"" +echo "PROCMAIL_version=%{version}-%{release}" +echo "ID=%{name}" +echo "HOME_URL=\"https://github.com/mbhangui/indimail-virtualdomains\"" +echo "PACKAGE_BUGREPORT=\"'@email@'\"" +) > %{name}-release %configure --prefix=%{_prefix} --enable-sendmail-prog=%{_prefix}/bin/sendmail \ --sysconfdir=/etc/indimail %install -[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -fr $RPM_BUILD_ROOT +[ "%{buildroot}" != "/" ] && /bin/rm -fr %{buildroot} %{__make} -s %{?_smp_mflags} %if %{defined nodebug} %{__make} -s %{?_smp_mflags} DESTDIR=%{buildroot} install-strip @@ -108,6 +128,11 @@ install -m 644 %{S:3} %{buildroot}%{_sysconfdir}/permissions.d/%{name}-permissio %endif %endif find %{buildroot}%{mandir} -type f -exec gzip -q {} \; +%{__mkdir_p} %{buildroot}%{sysconfdir} +install -m 0644 %{name}-rpm.info %{buildroot}%{sysconfdir}/%{name}-rpm.info +install -m 0644 %{name}-release %{buildroot}%{sysconfdir}/%{name}-release +/bin/rm -f %{name}-rpm.info %{name}-release +/bin/rm -f %{name}-rpm.info %files %defattr(-,root,root) @@ -116,8 +141,9 @@ find %{buildroot}%{mandir} -type f -exec gzip -q {} \; %attr(755,root,root) %{_prefix}/bin/lockfile %attr(755,root,root) %{_prefix}/bin/formail %attr(755,root,root) %{_prefix}/bin/mailstat -%attr(644,root,root) %config(noreplace) %{sysconfdir}/procmail.perms -%attr(644,root,root) %config(noreplace) %{sysconfdir}/procmail-release +%attr(644,root,root) %{sysconfdir}/procmail.perms +%attr(644,root,root) %{sysconfdir}/procmail-release +%attr(644,root,root) %{sysconfdir}/%{name}-rpm.info %if %noperms == 0 %if 0%{?suse_version} >= 1120 @@ -140,11 +166,6 @@ find %{buildroot}%{mandir} -type f -exec gzip -q {} \; ### SCRIPTLET ############################################################################### %verifyscript -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi %if %noperms == 0 %if 0%{?suse_version} >= 1120 %verify_permissions -e %{_prefix}/bin/procmail @@ -152,11 +173,6 @@ fi %endif %post -ID=$(id -u) -if [ $ID -ne 0 ] ; then - echo "You are not root" 1>&2 - exit 1 -fi %if %noperms == 0 %if 0%{?suse_version} >= 1120 %if 0%{?set_permissions:1} > 0