August 2014 - openSUSE Commits - openSUSE Mailing Lists

commit servletapi4 for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package servletapi4 for openSUSE:Factory checked in at 2014-08-01 19:26:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old) and /work/SRC/openSUSE:Factory/.servletapi4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "servletapi4" Changes: -------- --- /work/SRC/openSUSE:Factory/servletapi4/servletapi4.changes 2014-04-15 11:47:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.servletapi4.new/servletapi4.changes 2014-08-01 19:26:59.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 21 10:32:00 UTC 2014 - tchvatal(a)suse.com + +- Cleanup with spec-cleaner +- Fix update-alternatives + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servletapi4.spec ++++++ --- /var/tmp/diff_new_pack.kVEJgu/_old 2014-08-01 19:27:00.000000000 +0200 +++ /var/tmp/diff_new_pack.kVEJgu/_new 2014-08-01 19:27:00.000000000 +0200 @@ -16,57 +16,46 @@ # -Name: servletapi4 -BuildRequires: ant -BuildRequires: java2-devel-packages -BuildRequires: xml-commons-apis %define base_name servletapi -%define major_version 4 -%define name %{base_name}%{major_version} %define full_name jakarta-%{base_name} -%define version 4.0.4 -%define release 3jpp -%define section free +Name: servletapi4 Version: 4.0.4 Release: 0 Summary: Java servlet and JSP implementation classes License: Apache-1.1 Group: Development/Libraries/Java +Url: http://jakarta.apache.org/tomcat/ Source: %{full_name}-4-src.tar.gz Patch150: java150_build.patch -Url: http://jakarta.apache.org/tomcat/ -Provides: servlet -PreReq: /usr/sbin/update-alternatives +BuildRequires: ant BuildRequires: ant >= 1.2 +BuildRequires: java2-devel-packages BuildRequires: javapackages-tools -BuildArch: noarch +BuildRequires: xml-commons-apis +Requires(post): %{_sbindir}/update-alternatives +Provides: servlet = %{version} +Obsoletes: servlet22 < %{version} +Obsoletes: servlet4 < %{version} +Provides: servlet22 = %{version} +Provides: servlet4 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: servlet23 -Obsoletes: servlet4 -Provides: servlet23 -Provides: servlet4 +BuildArch: noarch %description This subproject contains the source code for the implementation classes of the Java Servlet and JSP APIs (packages javax.servlet). - - %package javadoc Summary: Javadoc for servletapi4 Group: Development/Libraries/Java -PreReq: coreutils %description javadoc This subproject contains the source code for the implementation classes of the Java Servlet and JSP APIs (packages javax.servlet). This package contains the javadoc documentation for the Java Servlet and JSP APIs. - - %prep -rm -rf $RPM_BUILD_ROOT -%setup -n %{full_name}-4-src +%setup -q -n %{full_name}-4-src %patch150 -p1 %build @@ -74,15 +63,15 @@ %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/lib/servlet.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 dist/lib/servlet.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name} +# alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar %post update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/%{name}-%{version}.jar 40 @@ -96,6 +85,8 @@ %defattr(-,root,root) %doc LICENSE README.txt %{_javadir}/* +%{_javadir}/servlet.jar +%ghost %{_sysconfdir}/alternatives/servlet.jar %files javadoc %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit servletapi5 for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package servletapi5 for openSUSE:Factory checked in at 2014-08-01 19:26:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servletapi5 (Old) and /work/SRC/openSUSE:Factory/.servletapi5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "servletapi5" Changes: -------- --- /work/SRC/openSUSE:Factory/servletapi5/servletapi5.changes 2013-08-25 13:32:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.servletapi5.new/servletapi5.changes 2014-08-01 19:26:57.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 21 10:38:49 UTC 2014 - tchvatal(a)suse.com + +- Cleanup with spec-cleaner. +- Fix update-alternatives code + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servletapi5.spec ++++++ --- /var/tmp/diff_new_pack.RMJYhH/_old 2014-08-01 19:26:57.000000000 +0200 +++ /var/tmp/diff_new_pack.RMJYhH/_new 2014-08-01 19:26:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package servletapi5 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,40 +16,34 @@ # -Name: servletapi5 -BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel -BuildRequires: xml-commons-apis-bootstrap -#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis -#!BuildIgnore: xml-commons-jaxp-1.3-apis %define base_name servletapi -%define major_version 5 -%define name %{base_name}%{major_version} %define full_name jakarta-%{base_name} -%define version 5.0.18 -%define release 1jpp -%define section free +Name: servletapi5 Version: 5.0.18 Release: 0 Summary: Java servlet and JSP implementation classes License: Apache-2.0 Group: Development/Libraries/Java +Url: http://jakarta.apache.org/tomcat/ Source: %{full_name}-5-src.tar.gz Patch150: java150_build.patch -Url: http://jakarta.apache.org/tomcat/ -Requires: /usr/sbin/update-alternatives -BuildArch: noarch +#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis +#!BuildIgnore: xml-commons-jaxp-1.3-apis +BuildRequires: ant +BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: xml-commons-apis-bootstrap +Requires(post): update-alternatives +Provides: servlet = %{version} +Provides: servlet24 = %{version} +Provides: servlet5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: servlet -Provides: servlet24 -Provides: servlet5 +BuildArch: noarch %description This subproject contains the source code for the implementation classes of the Java Servlet and JSP APIs (packages javax.servlet). %prep -rm -rf $RPM_BUILD_ROOT %setup -q -c -T -a 0 -n %{full_name}-5-src %patch150 @@ -70,14 +64,27 @@ %install cd jakarta-tomcat-%{version}-src/jakarta-servletapi-5 # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar -install -m 644 jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 jsr152/dist/lib/jsp-api.jar %{buildroot}%{_javadir}/jspapi-%{version}.jar +install -m 644 jsr154/dist/lib/servlet-api.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +# alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar + +%post +update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/%{name}-%{version}.jar 50 + +%postun +if [ "$1" = "0" ]; then + update-alternatives --remove servlet %{_javadir}/%{name}-%{version}.jar +fi %files %defattr(-,root,root) %doc LICENSE %{_javadir}/* +%{_javadir}/servlet.jar +%ghost %{_sysconfdir}/alternatives/servlet.jar %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xalan-j2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package xalan-j2 for openSUSE:Factory checked in at 2014-08-01 19:26:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xalan-j2 (Old) and /work/SRC/openSUSE:Factory/.xalan-j2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xalan-j2" Changes: -------- --- /work/SRC/openSUSE:Factory/xalan-j2/xalan-j2.changes 2014-06-27 06:53:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xalan-j2.new/xalan-j2.changes 2014-08-01 19:26:54.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 21 08:44:29 UTC 2014 - tchvatal(a)suse.com + +- Update-alternatives love. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xalan-j2.spec ++++++ --- /var/tmp/diff_new_pack.WzVXc8/_old 2014-08-01 19:26:55.000000000 +0200 +++ /var/tmp/diff_new_pack.WzVXc8/_new 2014-08-01 19:26:55.000000000 +0200 @@ -157,9 +157,7 @@ # alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}/%{_sysconfdir}/alternatives/jaxp_transform_impl.jar -ln -sf %{_sysconfdir}/alternatives/jaxp_transform_impl.jar \ - %{buildroot}%{_javadir}/jaxp_transform_impl.jar +ln -sf %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %{buildroot}%{_javadir}/jaxp_transform_impl.jar # bnc#485299 install -d -m 0755 %{buildroot}/%{_sysconfdir}/ant.d/ @@ -184,7 +182,7 @@ %{_javadir}/%{name}-serializer.jar %config %{_sysconfdir}/ant.d/serializer %ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar -%ghost %{_javadir}/jaxp_transform_impl.jar +%{_javadir}/jaxp_transform_impl.jar %files xsltc %defattr(0644,root,root,0755) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xerces-j2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package xerces-j2 for openSUSE:Factory checked in at 2014-08-01 19:26:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xerces-j2 (Old) and /work/SRC/openSUSE:Factory/.xerces-j2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xerces-j2" Changes: -------- --- /work/SRC/openSUSE:Factory/xerces-j2/xerces-j2.changes 2014-06-30 22:50:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xerces-j2.new/xerces-j2.changes 2014-08-01 19:26:53.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 21 09:58:48 UTC 2014 - tchvatal(a)suse.com + +- Fixup man page permissions + +------------------------------------------------------------------- +Mon Jul 21 09:20:42 UTC 2014 - tchvatal(a)suse.com + +- Sort out update-alternatives + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xerces-j2.spec ++++++ --- /var/tmp/diff_new_pack.sQPsyX/_old 2014-08-01 19:26:54.000000000 +0200 +++ /var/tmp/diff_new_pack.sQPsyX/_new 2014-08-01 19:26:54.000000000 +0200 @@ -17,8 +17,6 @@ %define cvs_version 2_11_0 -%define release 3jpp -%define section free Name: xerces-j2 Version: 2.11.0 Release: 0 @@ -186,8 +184,8 @@ (cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # scripts mkdir -p %{buildroot}%{_bindir} -cp -p %{SOURCE2} %{buildroot}%{_bindir}/%{name}-version -cp -p %{SOURCE4} %{buildroot}%{_bindir}/%{name}-constants +install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}-version +install -p -m 755 %{SOURCE4} %{buildroot}%{_bindir}/%{name}-constants # mans install -d -m 755 %{buildroot}%{_mandir}/man1 install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1 @@ -197,15 +195,12 @@ cp -p build/xercesSamples.jar \ %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar cp -pr data %{buildroot}%{_datadir}/%{name} -# jaxp_parser_impl ghost symlink -ln -s %{_sysconfdir}/alternatives \ - %{buildroot}%{_javadir}/jaxp_parser_impl.jar -# xml-apis ghost symlink -ln -s %{_sysconfdir}/alternatives \ - %{buildroot}%{_javadir}/xml-commons-apis.jar -# xml-resolver ghost symlink -ln -s %{_sysconfdir}/alternatives \ - %{buildroot}%{_javadir}/xml-commons-resolver.jar + +# alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %{buildroot}%{_javadir}/jaxp_parser_impl.jar +ln -sf %{_sysconfdir}/alternatives/xml-commons-apis.jar %{buildroot}%{_javadir}/xml-commons-apis.jar +ln -sf %{_sysconfdir}/alternatives/xml-commons-resolver.jar %{buildroot}%{_javadir}/xml-commons-resolver.jar %post %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23 @@ -220,48 +215,48 @@ %{_sbindir}/update-alternatives --auto xml-commons-resolver %preun -{ - [ $1 = 0 ] || exit 0 +if [ $1 = 0 ] ; then %{_sbindir}/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar -} >/dev/null 2>&1 || : +fi %preun xml-apis -{ - [ $1 = 0 ] || exit 0 +if [ $1 = 0 ] ; then %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar -} >/dev/null 2>&1 || : +fi %preun xml-resolver -{ - [ $1 = 0 ] || exit 0 +if [ $1 = 0 ] ; then %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/%{name}-xml-commons-resolver.jar -} >/dev/null 2>&1 || : +fi %files %defattr(0644,root,root,0755) %doc LICENSE README %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar -%ghost %{_javadir}/jaxp_parser_impl.jar +%{_javadir}/jaxp_parser_impl.jar +%ghost %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %files xml-apis %defattr(0644,root,root,0755) %{_javadir}/%{name}-%{version}-xml-apis.jar %{_javadir}/%{name}-xml-apis.jar -%ghost %{_javadir}/xml-commons-apis.jar +%{_javadir}/xml-commons-apis.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar %files xml-resolver %defattr(0644,root,root,0755) %{_javadir}/%{name}-%{version}-xml-resolver.jar %{_javadir}/%{name}-xml-resolver.jar -%ghost %{_javadir}/xml-commons-resolver.jar +%{_javadir}/xml-commons-resolver.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar %files demo %defattr(0644,root,root,0755) %{_datadir}/%{name} %files scripts -%defattr(0755,root,root,0755) +%defattr(-,root,root) %{_bindir}/* %{_mandir}/man1/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xml-commons for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package xml-commons for openSUSE:Factory checked in at 2014-08-01 19:26:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xml-commons (Old) and /work/SRC/openSUSE:Factory/.xml-commons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xml-commons" Changes: -------- --- /work/SRC/openSUSE:Factory/xml-commons/xml-commons-apis-bootstrap.changes 2013-09-14 19:10:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xml-commons.new/xml-commons-apis-bootstrap.changes 2014-08-01 19:26:50.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 28 06:48:00 UTC 2014 - tchvatal(a)suse.com + +- Remove update-alternatives as they are not used here. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/xml-commons/xml-commons.changes 2014-05-02 14:05:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xml-commons.new/xml-commons.changes 2014-08-01 19:26:50.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 25 09:08:26 UTC 2014 - tchvatal(a)suse.com + +- Fixup update-alternatives a bit to silence warnings. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-commons-apis-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.Y03FsH/_old 2014-08-01 19:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Y03FsH/_new 2014-08-01 19:26:52.000000000 +0200 @@ -50,7 +50,6 @@ BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel BuildRequires: fastjar -BuildRequires: update-alternatives %description This is xml-apis from the java-bootrapping-tools package. DO NOT ++++++ xml-commons.spec ++++++ --- /var/tmp/diff_new_pack.Y03FsH/_old 2014-08-01 19:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Y03FsH/_new 2014-08-01 19:26:52.000000000 +0200 @@ -167,12 +167,11 @@ %package resolver11 Summary: XmlResolver 1.1 utility from %{name} Group: Development/Libraries/Java -Provides: xml-commons-resolver = 1.1 -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: javapackages-tools Requires: jaxp_parser_impl -Requires: xml-commons-jaxp-1.2-apis = %{version}-%{release} -Provides: xml-commons-resolver = %{version}-%{release} +Requires: xml-commons-jaxp-1.2-apis = %{version} +Provides: xml-commons-resolver = %{version} Obsoletes: xml-commons-resolver <= 1.3.02 Requires(preun): update-alternatives Requires(post): update-alternatives @@ -479,38 +478,27 @@ # For Symlinks and alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/xml-commons-apis.jar ln -sf %{_sysconfdir}/alternatives/xml-commons-apis.jar %{buildroot}%{_javadir}/xml-commons-apis.jar -touch %{buildroot}%{_sysconfdir}/alternatives/xml-commons-which.jar ln -sf %{_sysconfdir}/alternatives/xml-commons-which.jar %{buildroot}%{_javadir}/xml-commons-which.jar -touch %{buildroot}%{_sysconfdir}/alternatives/xml-commons-resolver.jar ln -sf %{_sysconfdir}/alternatives/xml-commons-resolver.jar %{buildroot}%{_javadir}/xml-commons-resolver.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxp.jar ln -sf %{_sysconfdir}/alternatives/jaxp.jar %{buildroot}%{_javadir}/jaxp.jar -touch %{buildroot}%{_sysconfdir}/alternatives/dom3.jar ln -sf %{_sysconfdir}/alternatives/dom3.jar %{buildroot}%{_javadir}/dom3.jar -touch %{buildroot}%{_sysconfdir}/alternatives/dom2.jar ln -sf %{_sysconfdir}/alternatives/dom2.jar %{buildroot}%{_javadir}/dom2.jar -touch %{buildroot}%{_sysconfdir}/alternatives/dom.jar ln -sf %{_sysconfdir}/alternatives/dom.jar %{buildroot}%{_javadir}/dom.jar -touch %{buildroot}%{_sysconfdir}/alternatives/sax2.jar ln -sf %{_sysconfdir}/alternatives/sax2.jar %{buildroot}%{_javadir}/sax2.jar -touch %{buildroot}%{_sysconfdir}/alternatives/sax.jar ln -sf %{_sysconfdir}/alternatives/sax.jar %{buildroot}%{_javadir}/sax.jar -touch %{buildroot}%{_sysconfdir}/alternatives/xml-which ln -sf %{_sysconfdir}/alternatives/xml-which %{buildroot}%{_bindir}/xml-which -touch %{buildroot}%{_sysconfdir}/alternatives/xml-resolver ln -sf %{_sysconfdir}/alternatives/xml-resolver %{buildroot}%{_bindir}/xml-resolver -touch %{buildroot}%{_sysconfdir}/alternatives/xml-xread ln -sf %{_sysconfdir}/alternatives/xml-xread %{buildroot}%{_bindir}/xml-xread -touch %{buildroot}%{_sysconfdir}/alternatives/xml-xparse ln -sf %{_sysconfdir}/alternatives/xml-xparse %{buildroot}%{_bindir}/xml-xparse -touch %{buildroot}%{_sysconfdir}/alternatives/jaxp11.jar ln -sf %{_sysconfdir}/alternatives/jaxp11.jar %{buildroot}%{_javadir}/jaxp11.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxp12.jar ln -sf %{_sysconfdir}/alternatives/jaxp12.jar %{buildroot}%{_javadir}/jaxp12.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxp13.jar ln -sf %{_sysconfdir}/alternatives/jaxp13.jar %{buildroot}%{_javadir}/jaxp13.jar +ln -sf %{_sysconfdir}/alternatives/xslt.jar %{buildroot}%{_javadir}/xslt.jar +ln -sf %{_sysconfdir}/alternatives/xml-resolver.1.gz %{buildroot}/%{_mandir}/man1/xml-resolver.1.gz +ln -sf %{_sysconfdir}/alternatives/xml-resolver.1.gz %{buildroot}/%{_mandir}/man1/xml-resolver.1.gz +ln -sf %{_sysconfdir}/alternatives/xml-xread.1.gz %{buildroot}/%{_mandir}/man1/xml-xread.1.gz +ln -sf %{_sysconfdir}/alternatives/xml-xparse.1.gz %{buildroot}/%{_mandir}/man1/xml-xparse.1.gz %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}* @@ -535,10 +523,6 @@ export NO_BRP_STALE_LINK_ERROR=yes %endif -%clean -rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- - %post jaxp-1.1-apis #rm -f %{_javadir}/xml-commons-apis.jar rm -f %{_javadir}/jaxp11.jar @@ -691,20 +675,22 @@ # xml-commons-jaxp-1.1-apis.noarch: W: file-not-utf8 /usr/share/xml-commons-jaxp-1.1-apis-1.3.03/LICENSE.dom-documentation.txt %doc %{_datadir}/%{name}-jaxp-1.1-apis-%{version} %{_javadir}/%{name}-jaxp-1.1-apis*.jar -%ghost %{_javadir}/xml-commons-apis.jar +%{_javadir}/xml-commons-apis.jar %ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar -%ghost %{_javadir}/jaxp11.jar + %{_javadir}/jaxp11.jar %ghost %{_sysconfdir}/alternatives/jaxp11.jar -%ghost %{_javadir}/jaxp.jar +%{_javadir}/jaxp.jar %ghost %{_sysconfdir}/alternatives/jaxp.jar -%ghost %{_javadir}/dom2.jar +%{_javadir}/dom2.jar %ghost %{_sysconfdir}/alternatives/dom2.jar -%ghost %{_javadir}/dom.jar +%{_javadir}/dom.jar %ghost %{_sysconfdir}/alternatives/dom.jar -%ghost %{_javadir}/sax2.jar +%{_javadir}/sax2.jar %ghost %{_sysconfdir}/alternatives/sax2.jar -%ghost %{_javadir}/sax.jar +%{_javadir}/sax.jar %ghost %{_sysconfdir}/alternatives/sax.jar +%{_javadir}/xslt.jar +%ghost %{_sysconfdir}/alternatives/xslt.jar %files jaxp-1.1-apis-manual %defattr(0644,root,root,0755) @@ -713,16 +699,16 @@ %files which10 %defattr(0644,root,root,0755) %{_javadir}/%{name}-which10*.jar -%ghost %{_javadir}/xml-commons-which.jar +%{_javadir}/xml-commons-which.jar %ghost %{_sysconfdir}/alternatives/xml-commons-which.jar %attr(0755,root,root) %{_bindir}/xml-which10 -%ghost %{_bindir}/xml-which +%{_bindir}/xml-which %ghost %{_sysconfdir}/alternatives/xml-which %files resolver10 %defattr(0644,root,root,0755) %{_javadir}/%{name}-resolver10*.jar -%ghost %{_javadir}/xml-commons-resolver.jar +%{_javadir}/xml-commons-resolver.jar %ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar %attr(0755,root,root) %{_bindir}/xml-resolver10 %attr(0755,root,root) %{_bindir}/xml-xread10 @@ -730,17 +716,23 @@ %{_mandir}/man1/xml-resolver10.1* %{_mandir}/man1/xml-xread10.1* %{_mandir}/man1/xml-xparse10.1* -%ghost %{_bindir}/xml-resolver -%ghost %{_bindir}/xml-xread -%ghost %{_bindir}/xml-xparse +%{_bindir}/xml-resolver +%{_bindir}/xml-xread +%{_bindir}/xml-xparse %ghost %{_sysconfdir}/alternatives/xml-resolver %ghost %{_sysconfdir}/alternatives/xml-xread %ghost %{_sysconfdir}/alternatives/xml-xparse +%{_mandir}/man1/xml-resolver.1.gz +%{_mandir}/man1/xml-xread.1.gz +%{_mandir}/man1/xml-xparse.1.gz +%ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xread.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz %files resolver11 %defattr(0644,root,root,0755) %{_javadir}/%{name}-resolver11*.jar -%ghost %{_javadir}/xml-commons-resolver.jar +%{_javadir}/xml-commons-resolver.jar %ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar %attr(0755,root,root) %{_bindir}/xml-resolver11 %attr(0755,root,root) %{_bindir}/xml-xread11 @@ -748,30 +740,39 @@ %{_mandir}/man1/xml-resolver11.1* %{_mandir}/man1/xml-xread11.1* %{_mandir}/man1/xml-xparse11.1* -%ghost %{_bindir}/xml-resolver -%ghost %{_bindir}/xml-xread -%ghost %{_bindir}/xml-xparse +%{_bindir}/xml-resolver +%{_bindir}/xml-xread +%{_bindir}/xml-xparse %ghost %{_sysconfdir}/alternatives/xml-resolver %ghost %{_sysconfdir}/alternatives/xml-xread %ghost %{_sysconfdir}/alternatives/xml-xparse +%{_mandir}/man1/xml-resolver.1.gz +%{_mandir}/man1/xml-xread.1.gz +%{_mandir}/man1/xml-xparse.1.gz +%ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xread.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz %files jaxp-1.2-apis %defattr(0644,root,root,0755) %doc %{_datadir}/%{name}-jaxp-1.2-apis-%{version} %{_javadir}/%{name}-jaxp-1.2-apis*.jar +%{_javadir}/xml-commons-apis.jar %ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar -%ghost %{_javadir}/jaxp12.jar +%{_javadir}/jaxp12.jar %ghost %{_sysconfdir}/alternatives/jaxp12.jar -%ghost %{_javadir}/jaxp.jar +%{_javadir}/jaxp.jar %ghost %{_sysconfdir}/alternatives/jaxp.jar -%ghost %{_javadir}/dom2.jar +%{_javadir}/dom2.jar %ghost %{_sysconfdir}/alternatives/dom2.jar -%ghost %{_javadir}/dom.jar +%{_javadir}/dom.jar %ghost %{_sysconfdir}/alternatives/dom.jar -%ghost %{_javadir}/sax2.jar +%{_javadir}/sax2.jar %ghost %{_sysconfdir}/alternatives/sax2.jar -%ghost %{_javadir}/sax.jar +%{_javadir}/sax.jar %ghost %{_sysconfdir}/alternatives/sax.jar +%{_javadir}/xslt.jar +%ghost %{_sysconfdir}/alternatives/xslt.jar %files jaxp-1.2-apis-manual %defattr(0644,root,root,0755) @@ -787,20 +788,22 @@ %{_mavenpomdir}/JPP-%{name}-apis.pom %{_mavenpomdir}/JPP-%{name}-jaxp-1.3-apis.pom %{_mavenpomdir}/JPP-%{name}-jaxp-1.3-apis-ext.pom -%ghost %{_javadir}/xml-commons-apis.jar +%{_javadir}/xml-commons-apis.jar %ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar -%ghost %{_javadir}/jaxp13.jar +%{_javadir}/jaxp13.jar %ghost %{_sysconfdir}/alternatives/jaxp13.jar -%ghost %{_javadir}/jaxp.jar +%{_javadir}/jaxp.jar %ghost %{_sysconfdir}/alternatives/jaxp.jar -%ghost %{_javadir}/dom3.jar +%{_javadir}/dom3.jar %ghost %{_sysconfdir}/alternatives/dom3.jar -%ghost %{_javadir}/dom.jar +%{_javadir}/dom.jar %ghost %{_sysconfdir}/alternatives/dom.jar -%ghost %{_javadir}/sax2.jar +%{_javadir}/sax2.jar %ghost %{_sysconfdir}/alternatives/sax2.jar -%ghost %{_javadir}/sax.jar +%{_javadir}/sax.jar %ghost %{_sysconfdir}/alternatives/sax.jar +%{_javadir}/xslt.jar +%ghost %{_sysconfdir}/alternatives/xslt.jar %files jaxp-1.3-apis-manual %defattr(0644,root,root,0755) @@ -809,27 +812,35 @@ %files which11 %defattr(0644,root,root,0755) %{_javadir}/%{name}-which11*.jar -%ghost %ghost %{_javadir}/xml-commons-which.jar +%{_javadir}/xml-commons-which.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-which.jar %attr(0755,root,root) %{_bindir}/xml-which11 -%ghost %{_bindir}/xml-which +%{_bindir}/xml-which %ghost %{_sysconfdir}/alternatives/xml-which %files resolver12 %defattr(0644,root,root,0755) %{_javadir}/%{name}-resolver12*.jar -%ghost %{_javadir}/xml-commons-resolver.jar +%{_javadir}/xml-commons-resolver.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar %attr(0755,root,root) %{_bindir}/xml-resolver12 %attr(0755,root,root) %{_bindir}/xml-xread12 %attr(0755,root,root) %{_bindir}/xml-xparse12 %{_mandir}/man1/xml-resolver12.1* %{_mandir}/man1/xml-xread12.1* %{_mandir}/man1/xml-xparse12.1* -%ghost %{_bindir}/xml-resolver -%ghost %{_bindir}/xml-xread -%ghost %{_bindir}/xml-xparse +%{_bindir}/xml-resolver +%{_bindir}/xml-xread +%{_bindir}/xml-xparse %ghost %{_sysconfdir}/alternatives/xml-resolver %ghost %{_sysconfdir}/alternatives/xml-xread %ghost %{_sysconfdir}/alternatives/xml-xparse +%{_mandir}/man1/xml-resolver.1.gz +%{_mandir}/man1/xml-xread.1.gz +%{_mandir}/man1/xml-xparse.1.gz +%ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xread.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz %if %{with_repolib} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crimson for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package crimson for openSUSE:Factory checked in at 2014-08-01 19:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crimson (Old) and /work/SRC/openSUSE:Factory/.crimson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crimson" Changes: -------- --- /work/SRC/openSUSE:Factory/crimson/crimson.changes 2013-09-11 13:39:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crimson.new/crimson.changes 2014-08-01 19:26:49.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 25 09:22:03 UTC 2014 - tchvatal(a)suse.com + +- Cleanup with spec-cleaner and update alternatives + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crimson.spec ++++++ --- /var/tmp/diff_new_pack.Cy6fuM/_old 2014-08-01 19:26:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Cy6fuM/_new 2014-08-01 19:26:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package crimson # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,6 @@ # -%define section free - Name: crimson Version: 1.1.3 Release: 0 @@ -29,17 +27,17 @@ Patch0: %{name}-noapis.patch Patch1: %{name}-javac6-build.patch Patch2: %{name}-javac-target-15.patch -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: jaxp_parser_impl BuildRequires: ant BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: xml-commons-apis -Requires: xml-commons-apis -Requires(post): /usr/sbin/update-alternatives -Requires(preun): /usr/sbin/update-alternatives Requires: javapackages-tools +Requires: xml-commons-apis +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: jaxp_parser_impl +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Crimson is a Java XML parser which supports XML 1.0 via the @@ -54,13 +52,9 @@ javax.xml.transform can be found at Xalan Java 2. - SAX 2.0 - - SAX2 Extensions version 1.0 - - DOM Level 2 Core Recommendation - - %package manual Summary: Java XML parser Group: Development/Libraries/Java @@ -78,13 +72,9 @@ javax.xml.transform can be found at Xalan Java 2. - SAX 2.0 - - SAX2 Extensions version 1.0 - - DOM Level 2 Core Recommendation - - %package javadoc Summary: Java XML parser Group: Development/Libraries/Java @@ -102,13 +92,9 @@ javax.xml.transform can be found at Xalan Java 2. - SAX 2.0 - - SAX2 Extensions version 1.0 - - DOM Level 2 Core Recommendation - - %package demo Summary: Java XML parser Group: Development/Libraries/Java @@ -127,16 +113,12 @@ javax.xml.transform can be found at Xalan Java 2. - SAX 2.0 - - SAX2 Extensions version 1.0 - - DOM Level 2 Core Recommendation - - %prep %setup -q -%patch0 -p0 +%patch0 %patch1 -b .sav1 %patch2 -b .sav2 @@ -146,30 +128,25 @@ %install # jars -%{__mkdir} -p ${RPM_BUILD_ROOT}%{_javadir} -%{__cp} -p build/%{name}.jar \ - ${RPM_BUILD_ROOT}%{_javadir}/%{name}-%{version}.jar +mkdir -p %{buildroot}%{_javadir} +cp -p build/%{name}.jar \ + %{buildroot}%{_javadir}/%{name}-%{version}.jar ( - cd $RPM_BUILD_ROOT%{_javadir} + cd %{buildroot}%{_javadir} for jar in *-%{version}*; do - %{__ln_s} -f ${jar} `echo $jar | sed "s|-%{version}||g"` + ln -s -f ${jar} `echo $jar | sed "s|-%{version}||g"` done ) # javadoc -%{__mkdir} -p ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} -%{__cp} -pr build/docs/api/* \ - ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} -%{__ln_s} %{name}-%{version} \ - ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr build/docs/api/* \ + %{buildroot}%{_javadocdir}/%{name} # demo -%{__mkdir} -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} -%{__cp} -pr examples ${RPM_BUILD_ROOT}%{_datadir}/%{name} -# jaxp_parser_impl ghost symlink -%{__ln_s} %{_sysconfdir}/alternatives \ - ${RPM_BUILD_ROOT}%{_javadir}/jaxp_parser_impl.jar - -%clean -%{__rm} -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -pr examples %{buildroot}%{_datadir}/%{name} +# alternatives code +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %{buildroot}%{_javadir}/jaxp_parser_impl.jar %post update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \ @@ -184,7 +161,8 @@ %defattr(0644,root,root,0755) %doc ChangeLog README.txt %{_javadir}/%{name}*.jar -%ghost %{_javadir}/jaxp_parser_impl.jar +%{_javadir}/jaxp_parser_impl.jar +%ghost %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %files manual %defattr(0644,root,root,0755) @@ -192,7 +170,6 @@ %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files demo -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit classpathx-mail for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package classpathx-mail for openSUSE:Factory checked in at 2014-08-01 19:26:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/classpathx-mail (Old) and /work/SRC/openSUSE:Factory/.classpathx-mail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "classpathx-mail" Changes: -------- --- /work/SRC/openSUSE:Factory/classpathx-mail/classpathx-mail.changes 2013-09-11 13:39:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.classpathx-mail.new/classpathx-mail.changes 2014-08-01 19:26:48.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 21 08:00:40 UTC 2014 - tchvatal(a)suse.com + +- Cleanup with spec-cleaner. Fix update-alternatives code. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ classpathx-mail.spec ++++++ --- /var/tmp/diff_new_pack.vxSpRZ/_old 2014-08-01 19:26:49.000000000 +0200 +++ /var/tmp/diff_new_pack.vxSpRZ/_new 2014-08-01 19:26:49.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package classpathx-mail # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,6 @@ %define jmailver 1.3.1 %define inetlibver 1.1.1 - Name: classpathx-mail Version: 1.1.1 Release: 0 @@ -34,28 +33,24 @@ Patch3: %{name}-remove-inetlib.patch # see bz157685 Patch4: classpath-inetlib-docbuild.patch -PreReq: coreutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch BuildRequires: ant BuildRequires: jaf >= 1.0 +BuildRequires: java-devel +BuildRequires: java-sasl BuildRequires: javapackages-tools BuildRequires: jce BuildRequires: perl -# gnu-crypto is required for pre-1.5 JVMs only -#BuildRequires: gnu-crypto -%if %defined suse_version -BuildRequires: java-devel -%endif -BuildRequires: java-sasl Requires: jaf >= 1.0 Requires: java-sasl Requires: jce -Requires(preun): /usr/sbin/update-alternatives -Requires(post): /usr/sbin/update-alternatives +Requires(post): %{_sbindir}/update-alternatives +Requires(preun): %{_sbindir}/update-alternatives Provides: gnu-javamail = 1.0 Provides: javamail = %{jmailver} -Obsoletes: gnu-javamail <= 1.0 +Obsoletes: gnu-javamail < 1.0 +Obsoletes: javamail < %{jmailver} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description GNU JavaMail is a free implementation of the JavaMail API @@ -74,33 +69,25 @@ Maildir format All these providers are feature-complete, and provide cryptographically secure access where relevant. - - %package javadoc Summary: GNU JavaMail(tm) Group: Development/Languages/Java Provides: javamail-javadoc = 0:%{jmailver} -PreReq: coreutils -#BuildRequires: java-javadoc -# there's no classpathx-jaf in SUSE -#BuildRequires: jaf-javadoc %description javadoc GNU JavaMail(tm) is a free implementation of the JavaMail API. - - %{summary}. %prep %setup -q -n mail-%{version} -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 +%patch1 +%patch2 +%patch3 rm -f libmail.so bunzip2 -dc %{SOURCE1} | tar -xf - pushd inetlib-%{inetlibver} -%patch4 -p0 +%patch4 mkdir -p source/org/jpackage/mail mv source/gnu/inet source/org/jpackage/mail popd @@ -132,59 +119,34 @@ rm -Rf monolithic %install -rm -rf $RPM_BUILD_ROOT -install -dm 755 $RPM_BUILD_ROOT%{_javadir}/classpathx-mail +install -dm 755 %{buildroot}%{_javadir}/classpathx-mail # API -install -pm 644 gnumail.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-api-%{version}.jar -ln -s mail-%{jmailver}-api-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-api.jar -ln -s mail-%{jmailver}-api.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mailapi.jar +install -pm 644 gnumail.jar %{buildroot}%{_javadir}/classpathx-mail/mail-%{jmailver}-api-%{version}.jar +ln -s mail-%{jmailver}-api-%{version}.jar %{buildroot}%{_javadir}/classpathx-mail/mail-%{jmailver}-api.jar +ln -s mail-%{jmailver}-api.jar %{buildroot}%{_javadir}/classpathx-mail/mailapi.jar # Providers -install -pm 644 gnumail-providers.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-providers-%{version}.jar -ln -s mail-%{jmailver}-providers-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-providers.jar -ln -s mail-%{jmailver}-providers.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/providers.jar +install -pm 644 gnumail-providers.jar %{buildroot}%{_javadir}/classpathx-mail/mail-%{jmailver}-providers-%{version}.jar +ln -s mail-%{jmailver}-providers-%{version}.jar %{buildroot}%{_javadir}/classpathx-mail/mail-%{jmailver}-providers.jar +ln -s mail-%{jmailver}-providers.jar %{buildroot}%{_javadir}/classpathx-mail/providers.jar for prov in imap nntp pop3 smtp ; do - ln -s mail-%{jmailver}-providers.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/$prov-%{jmailver}.jar - ln -s providers.jar $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/$prov.jar + ln -s mail-%{jmailver}-providers.jar %{buildroot}%{_javadir}/classpathx-mail/$prov-%{jmailver}.jar + ln -s providers.jar %{buildroot}%{_javadir}/classpathx-mail/$prov.jar done -install -pm 644 monolithic.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail-%{jmailver}-monolithic-%{version}.jar -ln -s classpathx-mail-%{jmailver}-monolithic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar -touch $RPM_BUILD_ROOT%{_javadir}/javamail.jar # for %ghost -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{jmailver} -cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{jmailver} -ln -s %{name}-%{jmailver} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink - -%clean -rm -rf $RPM_BUILD_ROOT - -%triggerpostun -- classpathx-mail-monolithic <= 0:1.1.1-1jpp -# Remove file from old monolithic subpackage -rm -f %{_javadir}/javamail.jar -# Recreate the link as update-alternatives could not do it -ln -s %{_sysconfdir}/alternatives/javamail %{_javadir}/javamail.jar +install -pm 644 monolithic.jar %{buildroot}%{_javadir}/classpathx-mail-%{jmailver}-monolithic-%{version}.jar +ln -s classpathx-mail-%{jmailver}-monolithic-%{version}.jar %{buildroot}%{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -pR docs/* %{buildroot}%{_javadocdir}/%{name} + +# javamail alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/javamail.jar %{buildroot}%{_javadir}/javamail.jar %post -/usr/sbin/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar 010301 +%{_sbindir}/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar 010301 %preun if [ "$1" = "0" ]; then - /usr/sbin/update-alternatives --remove javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar -fi - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{jmailver} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} + %{_sbindir}/update-alternatives --remove javamail %{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar fi %files @@ -208,11 +170,11 @@ # Monolithic jar %{_javadir}/classpathx-mail-%{jmailver}-monolithic-%{version}.jar %{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar -%ghost %{_javadir}/javamail.jar +%{_javadir}/javamail.jar +%ghost %{_sysconfdir}/alternatives/javamail.jar %files javadoc %defattr(644,root,root,755) -%doc %{_javadocdir}/%{name}-%{jmailver} -%ghost %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ws-jaxme for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package ws-jaxme for openSUSE:Factory checked in at 2014-08-01 19:26:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ws-jaxme (Old) and /work/SRC/openSUSE:Factory/.ws-jaxme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ws-jaxme" Changes: -------- --- /work/SRC/openSUSE:Factory/ws-jaxme/ws-jaxme.changes 2014-07-16 16:50:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ws-jaxme.new/ws-jaxme.changes 2014-08-01 19:26:46.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 11 14:06:18 UTC 2014 - tchvatal(a)suse.com + +- Do not version javadoc dir. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ws-jaxme.spec ++++++ --- /var/tmp/diff_new_pack.rU96Zn/_old 2014-08-01 19:26:47.000000000 +0200 +++ /var/tmp/diff_new_pack.rU96Zn/_new 2014-08-01 19:26:47.000000000 +0200 @@ -132,9 +132,8 @@ (cd %{buildroot}%{_javadir}/%{base_name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) (cd %{buildroot}%{_javadir}/%{base_name} && for jar in ws-*.jar; do ln -sf ${jar} `echo $jar| sed "s|ws-||g"`; done) #javadoc -install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr build/docs/src/documentation/content/apidocs %{buildroot}%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr build/docs/src/documentation/content/apidocs %{buildroot}%{_javadocdir}/%{name} #manual install -dm 755 %{buildroot}%{_docdir}/%{name}-%{version} cp -pr build/docs/src/documentation/content/manual %{buildroot}%{_docdir}/%{name}-%{version} @@ -146,7 +145,6 @@ %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files manual -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gramps for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package gramps for openSUSE:Factory checked in at 2014-08-01 14:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gramps (Old) and /work/SRC/openSUSE:Factory/.gramps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gramps" Changes: -------- --- /work/SRC/openSUSE:Factory/gramps/gramps.changes 2014-07-24 07:31:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gramps.new/gramps.changes 2014-08-01 14:34:45.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 28 08:00:38 UTC 2014 - dimstar(a)opensuse.org + +- Add gramps-webkit3.0.patch: specify in the code that we require + WebKit 3.0, not 'any' WebKit (bnc#887048). +- No longer filter typelib(OsmGpsMap) from automatic dependency + scanner: we now have osm-gps-map 1.0.1 available. + +------------------------------------------------------------------- New: ---- gramps-webkit3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gramps.spec ++++++ --- /var/tmp/diff_new_pack.vuh6m0/_old 2014-08-01 14:34:46.000000000 +0200 +++ /var/tmp/diff_new_pack.vuh6m0/_new 2014-08-01 14:34:46.000000000 +0200 @@ -17,7 +17,7 @@ # -%global __requires_exclude typelib\$GtkosxApplication\$|typelib\$OsmGpsMap\$|typelib\$Gtkspell\$ +%global __requires_exclude typelib\$GtkosxApplication\$|typelib\$Gtkspell\$ Name: gramps Version: 4.0.4 @@ -28,6 +28,8 @@ Group: Productivity/Other Url: http://www.gramps-project.org/ Source: http://downloads.sourceforge.net/project/gramps/Stable/%{version}/%{name}-%… +# PATCH-FIX-UPSTREAM gramps-webkit3.0.patch dimstar(a)opensuse.org -- Specify that we need WebKit 3.0 +Patch0: gramps-webkit3.0.patch BuildRequires: fdupes BuildRequires: intltool # Needed for typelib() - Requires. @@ -55,6 +57,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build python setup.py build ++++++ gramps-webkit3.0.patch ++++++ Index: gramps-4.0.4/gramps/plugins/view/htmlrenderer.gpr.py =================================================================== --- gramps-4.0.4.orig/gramps/plugins/view/htmlrenderer.gpr.py +++ gramps-4.0.4/gramps/plugins/view/htmlrenderer.gpr.py @@ -54,6 +54,8 @@ TOOLKIT = NOWEB repository = Repository.get_default() if repository.enumerate_versions("WebKit"): try: + import gi + gi.require_version("WebKit", "3.0") from gi.repository import WebKit TOOLKIT = WEBKIT except: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monitoring-plugins-contentage for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '14

01 Aug '14

Hello community, here is the log from the commit of package monitoring-plugins-contentage for openSUSE:Factory checked in at 2014-08-01 14:34:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-contentage (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins-contentage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "monitoring-plugins-contentage" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins-contentage.new/monitoring-plugins-contentage.changes 2014-08-01 14:34:41.000000000 +0200 @@ -0,0 +1,37 @@ +------------------------------------------------------------------- +Wed Jul 30 15:04:04 UTC 2014 - lars(a)linux-schulserver.de + +- renamed to monitoring-plugins-contentage + +------------------------------------------------------------------- +Thu Jan 17 21:01:07 UTC 2013 - cfarrell(a)suse.com + +- license update: BSD-3-Clause + See check_contentage file + +------------------------------------------------------------------- +Thu May 3 18:52:42 UTC 2012 - lrupp(a)suse.de + +- update to 0.6: added performance data + +------------------------------------------------------------------- +Wed Jun 17 12:10:02 CEST 2009 - lrupp(a)suse.de + +- update to 0.4: added timeout option + +------------------------------------------------------------------- +Tue Jun 16 18:03:34 CEST 2009 - lrupp(a)suse.de + +- update to 0.3 (changes see below) + +------------------------------------------------------------------- +Tue Jun 16 17:33:56 CEST 2009 - lrupp(a)suse.de + +- print revision +- use hash for values + +------------------------------------------------------------------- +Mon Jun 15 18:49:04 CEST 2009 - lrupp(a)suse.de + +- initial package + New: ---- check_contentage monitoring-plugins-contentage.changes monitoring-plugins-contentage.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monitoring-plugins-contentage.spec ++++++ # # spec file for package monitoring-plugins-contentage # # Copyright (c) 2012-2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: monitoring-plugins-contentage Version: 0.6 Release: 1 License: BSD-3-Clause Summary: Check age of files in a directory Url: http://en.opensuse.org/Monitoring-plugins-contentage Group: System/Monitoring Source0: check_contentage BuildRequires: nagios-rpm-macros Provides: nagios-plugins-contentage = %{version}-%{release} Obsoletes: nagios-plugins-contentage < %{version}-%{release} Requires: perl(File::Basename) Requires: perl(File::stat) Requires: perl(Getopt::Long) Requires: perl(POSIX) Requires: perl(Time::HiRes) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description This plugin checks one or more directory for files older than a specified age. You can define the age of files for warning and critical states. Note: the plugin checks the mtime of files, not the ctime. Usage: check_dircontent.pl -w 24 -c 48 -p /tmp Options: -w|--warning : time for warnings (minutes) -c|--critical : time for critical warnings (minutes) -p|--pathnames : absolute path to the folders, split mutliple pathnames with commata -t|--timeout : timeout (default: 15) %prep # %build # %install install -D -m755 %{SOURCE0} %{buildroot}%{nagios_plugindir}/check_contentage %clean rm -rf %{buildroot} %files %defattr(-,root,root) # avoid build dependecy of nagios - own the dirs %dir %{nagios_libdir} %dir %{nagios_plugindir} %{nagios_plugindir}/check_contentage %changelog ++++++ check_contentage ++++++ #!/usr/bin/perl -w # nagios: -epn # # check_contentage - nagios plugin # # Copyright (C) 2012, SUSE Linux Products GmbH # Author: Lars Vogdt # # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. # # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. # # * Neither the name of the Novell nor the names of its contributors may be # used to endorse or promote products derived from this software without # specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # # $Id$ # use lib "/usr/lib/nagios/plugins"; use utils qw{$TIMEOUT %ERRORS print_revision}; use Time::HiRes qw{time alarm}; use strict; use warnings; use Getopt::Long; use File::Basename; use File::stat; use POSIX qw(strftime); our $version="0.4"; our $time_warn=1440; our $time_crit=4880; our @pathnames=qw(); our $help=0; our $rev=0; our $recursive=0; our $errorstr=""; our $DEBUG=0; our %status; # nagios requires a 3 for unknown errors. $SIG{__DIE__} = sub { print @_; exit 3; }; # Just in case of problems, let's not hang Nagios $SIG{'ALRM'} = sub { print "UNKNOWN - Plugin timed out\n"; exit $ERRORS{"UNKNOWN"}; }; alarm($TIMEOUT); sub print_usage { print "This plugin checks one or more directory for files older than a specified age.\n"; print "You can define the age of files for warning and critical states.\n\n"; print "Usage: ".basename($0)." -w $time_warn -c $time_crit -p /tmp\n"; print "Options:\n"; print " -w|--warning : time for warnings (minutes)\n"; print " -c|--critical : time for critical warnings (minutes)\n"; print " -p|--pathnames : absolute path to the folders, split mutliple pathnames with commata\n"; # print " -r|--recursive : dive into subfolders\n"; print " -t|--timeout : timeout (default: $TIMEOUT)\n"; } sub print_help { my $exitcode=shift || 1; print "Copyright (c) 2009, Novell, Inc.\n\n"; print_usage(); print "\n"; exit $exitcode; } sub print_error { my $error=shift || ''; print STDERR "\nERROR: $error\n\n"; &print_usage; exit $ERRORS{'UNKNOWN'}; } sub check_dir($$$){ my $dir = shift; my $secwarn = shift; my $seccrit = shift; my %res; my $count=0; my $futurecount=0; my $oldcount=0; my $warncount=0; $res{'level'}=$ERRORS{'OK'}; $res{'errorstr'}=""; if (opendir(DIR,"$dir")){ print "Working in $dir\n" if ($DEBUG); for (readdir(DIR)) { # if ($recursive){ # &check_dir("$dir/$_",$secwarn,$seccrit) if (-d "$dir/$_"); # } $count++; next if (! -f "$dir/$_"); my $mtime=stat("$dir/$_")->mtime; my $age = time() - $mtime; my $time=strftime("%a %b %e %H:%M:%S %Y",localtime($mtime)); print "$_ : $mtime : $age sec\n" if ($DEBUG); if ( $age < 0 ){ $res{'errorstr'}.="$dir/$_ was modified in the future!\n"; $res{'level'}=$ERRORS{'CRITICAL'}; $futurecount++; } elsif ( $age >= $seccrit ){ $res{'errorstr'}.="$dir/$_ was last modified on $time\n"; $res{'level'}=$ERRORS{'CRITICAL'}; $oldcount++; } elsif ( $age >= $secwarn ){ $res{'errorstr'}.="$dir/$_ was last modified on $time\n"; $res{'level'}=$ERRORS{'WARNING'} if ($res{'level'} < $ERRORS{'WARNING'}); $warncount++; } } } else { $res{'level'}=$ERRORS{'WARNING'}; $res{'errorstr'}="$dir not found or not readable"; } $res{'count'}=$count; $res{'futurecount'}=$futurecount; $res{'oldcount'}=$oldcount; $res{'warncount'}=$warncount; return \%res; } Getopt::Long::Configure('bundling'); if(!GetOptions( 'w|warning=i' => \$time_warn, 'c|critical=i' => \$time_crit, 'p|pathname=s' => \@pathnames, 'r|recursive' => \$recursive, 't|timeout=i' => \$TIMEOUT, 'h|help' => \$help, 'v|version' => \$rev, )){ &print_help(1); } &print_help(0) if ($help); if ($rev){ &print_revision(basename($0),$version); exit $ERRORS{'UNKNOWN'}; } print_error("warning must be greater than 0") if ($time_warn <= 0); print_error("critical must be greater than 0") if ($time_crit <= 0); print_error("critical ($time_crit) must be greater than warning ($time_warn)") if ($time_crit <= $time_warn); print_error("Please provide at least one pathname") if (!defined($pathnames[0]) || ( $pathnames[0] eq "" )); @pathnames=split(/,/,join(',',@pathnames)); our $secwarn = $time_warn * 60; our $seccrit = $time_crit * 60; print STDERR "TIMEOUT: $TIMEOUT\nWARN: $time_warn\nCRIT: $time_crit\nPATHNAMES: ".join(" ",@pathnames)."\n" if ($DEBUG); foreach my $path (@pathnames){ $status{"$path"}=check_dir("$path",$secwarn, $seccrit); } our $exitcode=0; our ($total_count,$future_count,$old_count,$warncount)=0; foreach my $path (sort(keys %status)){ if ((defined($status{$path}{'level'})) && ($status{$path}{'level'} > $exitcode)){ $exitcode=$status{$path}{'level'}; } if ((defined($status{$path}{'errorstr'})) && ($status{$path}{'errorstr'} ne '')){ $errorstr .= $status{$path}{'errorstr'}; } $total_count+=$status{$path}{'count'}; $future_count+=$status{$path}{'futurecount'}; $old_count+=$status{$path}{'oldcount'}; $warncount+=$status{$path}{'warncount'} } if ($exitcode){ if ( $exitcode == $ERRORS{'WARNING'}){ print "WARNING: Found files older than $time_warn minutes "; } elsif ( $exitcode == $ERRORS{'CRITICAL'}){ print "CRITICAL: Found files older than $time_crit minutes "; } print "$errorstr"; print "| total_files=$total_count;;;old_files=$old_count;;;warn_files=$warncount;;;files_with_future_timestamp=$future_count;;;\n"; exit $exitcode; } else { print "OK: Tested ".join(" ",@pathnames)." - no files older than $time_warn minutes found "; print "| total_files=$total_count;;;old_files=$old_count;;;warn_files=$warncount;;;files_with_future_timestamp=$future_count;;;\n"; exit $ERRORS{"OK"}; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0