UC-50 - support for suse, thanks Matt White and Levend Sayar!

danchang · Jul 24, 2010 · eb148c7 · eb148c7
1 parent 52493ae
commit eb148c7
Show file tree

Hide file tree

Showing 54 changed files with 363 additions and 52 deletions.
diff --git a/sipXacccode/sipxacccode.spec.in b/sipXacccode/sipxacccode.spec.in
@@ -9,6 +9,20 @@ Vendor: SIPfoundry
 Packager: SIPfoundry <[email protected]>
 Url: http://www.sipfoundry.org
 
+BuildRequires: ant-commons-logging
+BuildRequires: ant-junit
+BuildRequires: ant-nodeps
+BuildRequires: automake
+BuildRequires: java-devel >= 1.6
+BuildRequires: zip
+BuildRequires: sipxcommons >= %version
+BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
+BuildRequires: docbook-style-xsl
+%endif
+
 Source: %name-%version.tar.gz
 
 Requires: sipxcommserverlib >= %version
@@ -43,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%dir %{_datadir}/sipxecs
+%dir %{_datadir}/sipxecs/process.d
+%dir %{_datadir}/sipxecs/schema
 %attr(755,@SIPXPBXUSER@,@SIPXPBXUSER@) %{_datadir}/java/sipXecs/sipXacccode
 %attr(644,root,root) %{_datadir}/sipxecs/process.d/sipxacccode-process.xml
 %attr(644,root,root) %{_datadir}/sipxecs/schema/authcodes.xsd

diff --git a/sipXacd/sipxacd.spec.in b/sipXacd/sipxacd.spec.in
@@ -22,7 +22,11 @@ BuildRequires: sipxmedialib-devel >= %version
 BuildRequires: sipxportlib-devel >= %version
 BuildRequires: sipxtacklib-devel >= %version
 BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
 BuildRequires: docbook-style-xsl
+%endif
 
 Source:   %name-%version.tar.gz
 
@@ -83,11 +87,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/sipxacd.sh
 %attr(755,root,root) %{_bindir}/sipxacd-config
 %attr(755,root,root) %{_bindir}/sipxacd
+%dir %{_datadir}/sipxecs
+%dir %{_datadir}/sipxecs/process.d
 %attr(644,root,root) %{_datadir}/sipxecs/process.d/sipxacd-process.xml
 
 
 %files devel
 %defattr(644,root,root,755)
+%docdir %{_datadir}/doc/sipxecs/%name  
+%{_datadir}/doc/sipxecs/%name
 
 %pre
 

diff --git a/sipXbridge/sipxbridge.spec.in b/sipXbridge/sipxbridge.spec.in
@@ -18,7 +18,11 @@ BuildRequires: zip
 BuildRequires: sipxcommons >= %version
 BuildRequires: sipxrelay >= %version
 BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
 BuildRequires: docbook-style-xsl
+%endif
 
 Source: %name-%version.tar.gz
 
@@ -46,6 +50,8 @@ make all
 
 %install
 
+export NO_BRP_CHECK_BYTECODE_VERSION=true
+
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 

diff --git a/sipXcallController/sipxcallcontroller.spec.in b/sipXcallController/sipxcallcontroller.spec.in
@@ -18,7 +18,11 @@ BuildRequires: zip
 BuildRequires: sipxcommons >= %version
 BuildRequires: sipxrest >= %version
 BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
 BuildRequires: docbook-style-xsl
+%endif
 
 Source: %name-%version.tar.gz
 
@@ -47,6 +51,8 @@ make all
 
 %install
 
+export NO_BRP_CHECK_BYTECODE_VERSION=true
+
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 

diff --git a/sipXcallLib/Makefile.am b/sipXcallLib/Makefile.am
@@ -22,6 +22,7 @@ EXTRA_DIST = \
     CONTRIBUTORS \
     SVN-VERSION \
     BUILDSTAMP \
+    @PACKAGE@-rpmlintrc \
     sipxcalllib.spec
 
 

diff --git a/sipXcallLib/sipxcalllib-rpmlintrc b/sipXcallLib/sipxcalllib-rpmlintrc
@@ -0,0 +1 @@
+setBadness('shlib-policy-name-error', 0)
diff --git a/sipXcallLib/sipxcalllib.spec.in b/sipXcallLib/sipxcalllib.spec.in
@@ -21,7 +21,11 @@ BuildRequires: sipxmediaadapterlib-devel >= %version
 BuildRequires: sipxmedialib-devel >= %version
 BuildRequires: sipxtacklib-devel >= %version
 BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
 BuildRequires: docbook-style-xsl
+%endif
 
 Source: %name-%version.tar.gz
 
@@ -46,6 +50,10 @@ contains technologies related to call processing:
 * tao - A transport layer designed to decouple (and remote) the
   application layer from call processing.
 
+%if %{_vendor} == suse
+%debug_package
+%endif
+
 # Install header files
 %package devel
 Requires: %name
@@ -75,6 +83,8 @@ helpful to build projects from the sipX library
 
 %prep
 %setup -q
+# suse and obs build system
+mv %{_builddir}/%name-%version/%name-rpmlintrc %{_sourcedir}
 
 %build
 %configure @CONFIGURE_OPTIONS@
@@ -108,6 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/sipxecs/%name
 
 %{_libdir}/libsipXcall.a
+
+%dir %attr(755,root,root) %{_includedir}/cp
+%dir %attr(755,root,root) %{_includedir}/ps
+%dir %attr(755,root,root) %{_includedir}/ptapi
+%dir %attr(755,root,root) %{_includedir}/tao
+%dir %attr(755,root,root) %{_includedir}/tapi
+
 %{_includedir}/cp/*
 %{_includedir}/ps/*
 %{_includedir}/ptapi/*

diff --git a/sipXcdrLog/sipxcdrlog.spec.in b/sipXcdrLog/sipxcdrlog.spec.in
@@ -18,7 +18,11 @@ BuildRequires: zip
 BuildRequires: sipxcommons >= %version
 BuildRequires: sipxrest >= %version
 BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
 BuildRequires: docbook-style-xsl
+%endif
 
 Source: %name-%version.tar.gz
 
@@ -47,6 +51,8 @@ make all
 
 %install
 
+export NO_BRP_CHECK_BYTECODE_VERSION=true
+
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 

diff --git a/sipXcommons/Makefile.am b/sipXcommons/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = \
    BUILDSTAMP \
    SVN-VERSION \
    sipxcommons.spec \
+   @PACKAGE@-rpmlintrc \
    config.properties.in \
    lib \
    src

diff --git a/sipXcommons/sipxcommons-rpmlintrc b/sipXcommons/sipxcommons-rpmlintrc
@@ -0,0 +1 @@
+setBadness('arch-dependent-file-in-usr-share', 0)
diff --git a/sipXcommons/sipxcommons.spec.in b/sipXcommons/sipxcommons.spec.in
@@ -8,8 +8,11 @@ Group: Productivity/Telephony/SIP/Servers
 Vendor: SIPfoundry
 Packager: SIPfoundry <[email protected]>
 Url: http://www.sipfoundry.org/sipXcommons
-
+%if %{_vendor} == suse
+BuildRequires: java-1_6_0-sun-devel
+%else
 BuildRequires: java-devel >= 1.6
+%endif
 BuildRequires: ant-commons-logging
 BuildRequires: ant-junit
 BuildRequires: ant-nodeps
@@ -22,11 +25,19 @@ BuildRequires: pwdutils
 %endif
 BuildRequires: zip
 BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
 BuildRequires: docbook-style-xsl
+%endif
 
 Source: %name-%version.tar.gz
 
+%if %{_vendor} == suse
+Requires: pwdutils
+%else
 Requires: shadow-utils
+%endif
 
 %if %{?use_ibm_jvm}0
 Requires: java-ibm >= 1.6
@@ -36,7 +47,7 @@ Requires: java >= 1.6
 %endif
 
 %if %{_vendor} == suse
-Requires: openssl >= 0.9.8k
+Requires: openssl >= 0.9.8
 %endif
 
 Prefix: %_prefix
@@ -47,6 +58,8 @@ Common server side Java packages and supporting third-parth JAR's for sipX
 
 %prep
 %setup -q
+# suse and obs build system
+mv %{_builddir}/%name-%version/%name-rpmlintrc %{_sourcedir}
 
 %build
 %configure @CONFIGURE_OPTIONS@
@@ -55,6 +68,8 @@ make all
 
 %install
 
+export NO_BRP_CHECK_BYTECODE_VERSION=true
+
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -77,7 +92,10 @@ done
 # Red Hat's useradd command adds the group automatically,
 # but SUSE does not.
 # The -f option means to create the group only if it does not already exist.
-/usr/sbin/groupadd -f @SIPXPBXGROUP@
+%if %{_vendor} == suse
+%else
+/usr/sbin/groupadd -f sipxchange
+%endif
 if ! id -u @SIPXPBXUSER@ > /dev/null 2>&1 ; then
    /usr/sbin/useradd \
        -c "sipX service daemon" \
@@ -91,4 +109,8 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%dir %attr(755,@SIPXPBXUSER@,@SIPXPBXGROUP@) %{_datadir}/java/sipXecs
 %attr(755,@SIPXPBXUSER@,@SIPXPBXGROUP@) %{_datadir}/java/sipXecs/sipXcommons
+
+%changelog
+
diff --git a/sipXcommserverLib/Makefile.am b/sipXcommserverLib/Makefile.am
@@ -13,6 +13,7 @@ EXTRA_DIST = \
     CONTRIBUTORS \
     SVN-VERSION \
     BUILDSTAMP \
+    @PACKAGE@-rpmlintrc \
     sipxcommserverlib.spec
 
 include config/conditional_doc.am

diff --git a/sipXcommserverLib/sipxcommserverlib-rpmlintrc b/sipXcommserverLib/sipxcommserverlib-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('permissions-file-setuid-bit', 0)  
+setBadness('shlib-policy-name-error', 0)
diff --git a/sipXcommserverLib/sipxcommserverlib.spec.in b/sipXcommserverLib/sipxcommserverlib.spec.in
@@ -1,3 +1,4 @@
+#!BuildIgnore: post-build-checks
 Name: @PACKAGE@
 Version: @VERSION@
 Release: %{buildno}
@@ -6,7 +7,6 @@ Summary: Common Code for sipX servers
 License: Pingtel Commercial License
 Group: Development/Libraries
 Vendor: Pingtel Corp.
-Packager: Pingtel <[email protected]>
 Url: http://www.pingtel.com
 
 BuildRequires: automake
@@ -23,13 +23,21 @@ BuildRequires: xerces-c-devel >= 2.6.0
 BuildRequires: shadow-utils
 %endif
 BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
 BuildRequires: docbook-style-xsl
+%endif
 
 Source: %name-%version.tar.gz
 
 Requires: rpm
 %if %{_vendor} == suse
-Requires: Xerces-c >= 2.6.0
+BuildRequires: apache2-devel
+BuildRequires: xerces-c-devel = 2.8.0
+Requires: xerces-c >= 2.6.0
+BuildRequires: pwdutils
+Requires: pwdutils
 %endif
 %if %{_vendor} == redhat
 Requires: xerces-c >= 2.6.0
@@ -79,6 +87,8 @@ helpful to build projects using the sipXcommserverLib library
 
 %prep
 %setup -q
+# suse and obs build system
+mv %{_builddir}/%name-%version/%name-rpmlintrc %{_sourcedir}
 
 %build
 %configure @CONFIGURE_OPTIONS@
@@ -198,3 +208,5 @@ fi
 %{_includedir}/alarm/*
 %{_includedir}/sipXecsService/*
 %{_includedir}/testlib/*
+
+%changelog
diff --git a/sipXconfig/Makefile.am b/sipXconfig/Makefile.am
@@ -73,6 +73,7 @@ EXTRA_DIST = \
     lib.properties \
     neoconf \
     gwt \
+    @PACKAGE@-rpmlintrc \
     sipxconfig.spec \
     doc \
     web \

diff --git a/sipXconfig/sipxconfig-rpmlintrc b/sipXconfig/sipxconfig-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('suse-filelist-empty', 0)
+setBadness('suse-filelist-forbidden', 0)
diff --git a/sipXconfig/sipxconfig.spec.in b/sipXconfig/sipxconfig.spec.in
@@ -1,3 +1,4 @@
+#!BuildIgnore: post-build-checks
 Name: @PACKAGE@
 Version: @VERSION@
 Release: %{buildno}
@@ -33,7 +34,11 @@ BuildRequires: rubygem-rake
 BuildRequires: sipx-jasperreports-deps
 BuildRequires: sipxcommons >= %version
 BuildRequires: asciidoc
+%if %{_vendor} == suse
+BuildRequires: docbook-xsl-stylesheets
+%else
 BuildRequires: docbook-style-xsl
+%endif
 
 %define sipxpbxlog %{_localstatedir}/log/sipxpbx
 %define sipxpbxrun %{_localstatedir}/run/sipxpbx
@@ -62,6 +67,7 @@ Obsoletes: sipx-jasperreports-deps
 
 %if %{_vendor} == suse
 Requires: apache2-prefork
+Requires: pwdutils
 %endif
 
 %if %{?use_ibm_jvm}0
@@ -204,6 +210,8 @@ run on the same machine it's default setup it to point to localhost.
 
 %prep
 %setup -q
+# suse and obs build system
+mv %{_builddir}/%name-%version/%name-rpmlintrc %{_sourcedir}
 
 %build
 
@@ -212,7 +220,7 @@ cp config.log %name.configlog
 make
 
 %install
-
+export NO_BRP_CHECK_BYTECODE_VERSION=true
 # makeinstall RPM macro doesn't leverage DESTDIR but instead overrides
 # libdir, bindir, etc just for make install. This not copesetic w/how
 # our makefiles are built, they'd rather preserve libdir, and use

diff --git a/sipXecs/Makefile.am b/sipXecs/Makefile.am
@@ -9,6 +9,7 @@ EXTRA_DIST = \
 	config/sipX-buildstamp.h.in \
 	config/sipX-config.in \
 	config/svn-version \
+	@PACKAGE@-rpmlintrc \
 	@[email protected]
 
 DISTCLEANFILES = \

diff --git a/sipXecs/sipxecs-rpmlintrc b/sipXecs/sipxecs-rpmlintrc
@@ -0,0 +1 @@
+setBadness('suse-filelist-empty', 0)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		setBadness('arch-dependent-file-in-usr-share', 0)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		setBadness('permissions-file-setuid-bit', 0)
		setBadness('shlib-policy-name-error', 0)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		setBadness('suse-filelist-empty', 0)
		setBadness('suse-filelist-forbidden', 0)