June 2012 - openSUSE Commits - openSUSE Mailing Lists

commit jedit for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package jedit for openSUSE:12.2 checked in at 2012-06-29 15:20:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/jedit (Old) and /work/SRC/openSUSE:12.2/.jedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jedit", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:12.2/jedit/jedit.changes 2012-06-25 15:36:03.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.jedit.new/jedit.changes 2012-06-29 15:20:49.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jun 27 14:31:29 UTC 2012 - mvyskocil(a)suse.cz + +- update to 4.5.1 (bugfix release) +- build it from source and don't bundle everything in a tarball +- strip documentation build and install as it's extremly complicated and needs + a lot of dependencies +- reworked launcher script + +------------------------------------------------------------------- Old: ---- deps.sh jedit4.5.0source.tar.bz2 New: ---- jedit4.5.1source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jedit.spec ++++++ --- /var/tmp/diff_new_pack.nPMX0N/_old 2012-06-29 15:20:51.000000000 +0200 +++ /var/tmp/diff_new_pack.nPMX0N/_new 2012-06-29 15:20:51.000000000 +0200 @@ -20,7 +20,7 @@ %define section free Name: jedit -Version: 4.5.0 +Version: 4.5.1 Release: 0 Summary: Programmer's Text Editor Written in Java License: GPL-2.0+ @@ -33,16 +33,18 @@ Source3: %{name}-48.png Source4: %{name}.desktop Source5: %{name}.in -Source100: deps.sh Patch0: 00build.xml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant +BuildRequires: ant-contrib BuildRequires: ant-nodeps +BuildRequires: bsh2 BuildRequires: desktop-file-utils -BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes -BuildRequires: java-1_6_0-openjdk-devel +BuildRequires: hicolor-icon-theme +BuildRequires: ivy +BuildRequires: java-devel >= 1.6.0 %description jEdit is a cross-platform programmer's text editor written in Java. @@ -64,14 +66,6 @@ * Every other feature, both basic and advanced, that you would expect to find in a text editor. -%package javadoc -PreReq: coreutils -Summary: Programmer's text editor written in Java (Documentation) -Group: Productivity/Editors/Other - -%description javadoc -Javadoc for jedit. - %prep %setup -q -D -n jEdit @@ -80,35 +74,30 @@ %build -# Specify some properties -cat <<EOF > build.properties -xsltproc.executable=%{_bindir}/xsltproc -docbook.xsl=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/ -docbook.catalog=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/catalog.xml -EOF +mkdir -p lib/ivy; ln -sf $(build-classpath ivy) lib/ivy/ivy-2.2.0.jar +mkdir -p lib/ant-contrib; ln -sf $(build-classpath ant-contrib) lib/ant-contrib/ +mkdir -p lib/scripting; ln -sf $(build-classpath bsh2/bsh) lib/scripting/ +mkdir -p lib/scripting; ln -sf $(build-classpath bsh2/bsh-engine) lib/scripting/ +mkdir -p lib/default-plugins/ # Run the build -%ant \ - build docs-html docs-javadoc +ant \ + build %install # dirs %__install -d -m 0755 %{buildroot}%{_bindir} +%__install -d -m 0755 %{buildroot}%{_javadir} %__install -d -m 0755 %{buildroot}%{_datadir}/%{name} %__install -d -m 0755 %{buildroot}%{_datadir}/applications -%__install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} %__install -d -m 0755 %{buildroot}%{_mandir}/man1/ -# Copy the jar to /usr/share/java (w/ version number) and then symlink to it from /usr/share/jedit -%__install -d -m 0755 %{buildroot}%{_javadir} -%__install build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_datadir}/%{name} && %__ln_s %{_javadir}/%{name}-%{version}.jar %{name}.jar) || true +# jar +%__install build/%{name}.jar %{buildroot}%{_datadir}/%{name}/%{name}.jar +ln -sf %{_datadir}/%{name}/%{name}.jar %{buildroot}/%{_javadir}/ # Install the /usr/share/jedit subdirectories -%__cp -ar build/{doc,jars,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name} - -# Symlink the javadoc into /usr/share/jedit -(cd %{buildroot}%{_datadir}/%{name}/doc && %__ln_s %{_javadocdir}/%{name} api) +%__cp -ar build/{jars,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name} # Man page %__install -m 0644 package-files/linux/%{name}.1 %{buildroot}%{_mandir}/man1/ @@ -122,7 +111,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} # Launcher script -%__cat %{SOURCE5} | sed 's|@data|%{_datadir}/%{name}|g' > %{name} +%__cat %{SOURCE5} | sed 's|@@DATADIR@@|%{_datadir}/%{name}|g' > %{name} %__install %{name} %{buildroot}%{_bindir} %fdupes -s %{buildroot} @@ -139,16 +128,11 @@ %files %defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/%{name} +%doc doc/* %{_javadir}/* %{_datadir}/%{name}/ -%{_datadir}/applications/ +%{_datadir}/applications/* %{_mandir}/man1/%{name}.1* %{_datadir}/icons/hicolor/ -%exclude %{_datadir}/%{name}/doc/api - -%files javadoc -%defattr(0644,root,root,0755) -%doc %{_javadocdir}/%{name} -%{_datadir}/%{name}/doc/api %changelog ++++++ 00build.xml.patch ++++++ --- /var/tmp/diff_new_pack.nPMX0N/_old 2012-06-29 15:20:51.000000000 +0200 +++ /var/tmp/diff_new_pack.nPMX0N/_new 2012-06-29 15:20:51.000000000 +0200 @@ -2,20 +2,6 @@ =================================================================== --- build.xml (revision 21227) +++ build.xml (working copy) -@@ -109,6 +109,13 @@ - </not> - </condition> - </fail> -+ <fail message="Dependencies not found. Please run deps.sh and try again."> -+ <condition> -+ <not> -+ <available file="lib" type="dir" /> -+ </not> -+ </condition> -+ </fail> - <property name="init.done" - value="true"/> - </target> @@ -145,6 +152,7 @@ description="retrieve the dependencies" depends="init,init-ivy" ++++++ jedit.in ++++++ --- /var/tmp/diff_new_pack.nPMX0N/_old 2012-06-29 15:20:51.000000000 +0200 +++ /var/tmp/diff_new_pack.nPMX0N/_new 2012-06-29 15:20:51.000000000 +0200 @@ -1,21 +1,16 @@ #!/bin/sh # -# Runs jEdit -# -# You can specify which Java installation to use through the JAVA_HOME -# environment variable. Otherwise, this will look for Java in the -# system PATH. -# -# You can set a global value for JAVA_HOME in /etc/environment. +# jEdit start script +# JPackage Project <http://www.jpackage.org/> -if [ -z "$JAVA_HOME" ]; then - JAVA=`which java 2>/dev/null` - if [ -z "$JAVA" ]; then - echo "Failed to find the java virtual machine! Bailing..." - exit 1 - fi +# Source functions library +if [ -f /usr/share/java-utils/java-functions ] ; then + . /usr/share/java-utils/java-functions else - JAVA="$JAVA_HOME/bin/java" + echo "Can't find functions library, aborting" + exit 1 fi -exec "$JAVA" -jar @data/jedit.jar -reuseview "$@" +set_javacmd + +exec "${JAVACMD}" -jar @@DATADIR@@/jedit.jar "$@" ++++++ jedit4.5.0source.tar.bz2 -> jedit4.5.1source.tar.bz2 ++++++ /work/SRC/openSUSE:12.2/jedit/jedit4.5.0source.tar.bz2 /work/SRC/openSUSE:12.2/.jedit.new/jedit4.5.1source.tar.bz2 differ: char 1, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jedit for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package jedit for openSUSE:Factory checked in at 2012-06-29 15:20:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jedit (Old) and /work/SRC/openSUSE:Factory/.jedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jedit", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/jedit/jedit.changes 2012-06-18 14:51:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jedit.new/jedit.changes 2012-06-29 15:20:42.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jun 27 14:31:29 UTC 2012 - mvyskocil(a)suse.cz + +- update to 4.5.1 (bugfix release) +- build it from source and don't bundle everything in a tarball +- strip documentation build and install as it's extremly complicated and needs + a lot of dependencies +- reworked launcher script + +------------------------------------------------------------------- Old: ---- deps.sh jedit4.5.0source.tar.bz2 New: ---- jedit4.5.1source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jedit.spec ++++++ --- /var/tmp/diff_new_pack.x7v9OT/_old 2012-06-29 15:20:48.000000000 +0200 +++ /var/tmp/diff_new_pack.x7v9OT/_new 2012-06-29 15:20:48.000000000 +0200 @@ -20,7 +20,7 @@ %define section free Name: jedit -Version: 4.5.0 +Version: 4.5.1 Release: 0 Summary: Programmer's Text Editor Written in Java License: GPL-2.0+ @@ -33,16 +33,18 @@ Source3: %{name}-48.png Source4: %{name}.desktop Source5: %{name}.in -Source100: deps.sh Patch0: 00build.xml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant +BuildRequires: ant-contrib BuildRequires: ant-nodeps +BuildRequires: bsh2 BuildRequires: desktop-file-utils -BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes -BuildRequires: java-1_6_0-openjdk-devel +BuildRequires: hicolor-icon-theme +BuildRequires: ivy +BuildRequires: java-devel >= 1.6.0 %description jEdit is a cross-platform programmer's text editor written in Java. @@ -64,14 +66,6 @@ * Every other feature, both basic and advanced, that you would expect to find in a text editor. -%package javadoc -PreReq: coreutils -Summary: Programmer's text editor written in Java (Documentation) -Group: Productivity/Editors/Other - -%description javadoc -Javadoc for jedit. - %prep %setup -q -D -n jEdit @@ -80,35 +74,30 @@ %build -# Specify some properties -cat <<EOF > build.properties -xsltproc.executable=%{_bindir}/xsltproc -docbook.xsl=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/ -docbook.catalog=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/catalog.xml -EOF +mkdir -p lib/ivy; ln -sf $(build-classpath ivy) lib/ivy/ivy-2.2.0.jar +mkdir -p lib/ant-contrib; ln -sf $(build-classpath ant-contrib) lib/ant-contrib/ +mkdir -p lib/scripting; ln -sf $(build-classpath bsh2/bsh) lib/scripting/ +mkdir -p lib/scripting; ln -sf $(build-classpath bsh2/bsh-engine) lib/scripting/ +mkdir -p lib/default-plugins/ # Run the build -%ant \ - build docs-html docs-javadoc +ant \ + build %install # dirs %__install -d -m 0755 %{buildroot}%{_bindir} +%__install -d -m 0755 %{buildroot}%{_javadir} %__install -d -m 0755 %{buildroot}%{_datadir}/%{name} %__install -d -m 0755 %{buildroot}%{_datadir}/applications -%__install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} %__install -d -m 0755 %{buildroot}%{_mandir}/man1/ -# Copy the jar to /usr/share/java (w/ version number) and then symlink to it from /usr/share/jedit -%__install -d -m 0755 %{buildroot}%{_javadir} -%__install build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_datadir}/%{name} && %__ln_s %{_javadir}/%{name}-%{version}.jar %{name}.jar) || true +# jar +%__install build/%{name}.jar %{buildroot}%{_datadir}/%{name}/%{name}.jar +ln -sf %{_datadir}/%{name}/%{name}.jar %{buildroot}/%{_javadir}/ # Install the /usr/share/jedit subdirectories -%__cp -ar build/{doc,jars,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name} - -# Symlink the javadoc into /usr/share/jedit -(cd %{buildroot}%{_datadir}/%{name}/doc && %__ln_s %{_javadocdir}/%{name} api) +%__cp -ar build/{jars,macros,modes,properties,startup} %{buildroot}%{_datadir}/%{name} # Man page %__install -m 0644 package-files/linux/%{name}.1 %{buildroot}%{_mandir}/man1/ @@ -122,7 +111,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} # Launcher script -%__cat %{SOURCE5} | sed 's|@data|%{_datadir}/%{name}|g' > %{name} +%__cat %{SOURCE5} | sed 's|@@DATADIR@@|%{_datadir}/%{name}|g' > %{name} %__install %{name} %{buildroot}%{_bindir} %fdupes -s %{buildroot} @@ -139,16 +128,11 @@ %files %defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/%{name} +%doc doc/* %{_javadir}/* %{_datadir}/%{name}/ -%{_datadir}/applications/ +%{_datadir}/applications/* %{_mandir}/man1/%{name}.1* %{_datadir}/icons/hicolor/ -%exclude %{_datadir}/%{name}/doc/api - -%files javadoc -%defattr(0644,root,root,0755) -%doc %{_javadocdir}/%{name} -%{_datadir}/%{name}/doc/api %changelog ++++++ 00build.xml.patch ++++++ --- /var/tmp/diff_new_pack.x7v9OT/_old 2012-06-29 15:20:48.000000000 +0200 +++ /var/tmp/diff_new_pack.x7v9OT/_new 2012-06-29 15:20:48.000000000 +0200 @@ -2,20 +2,6 @@ =================================================================== --- build.xml (revision 21227) +++ build.xml (working copy) -@@ -109,6 +109,13 @@ - </not> - </condition> - </fail> -+ <fail message="Dependencies not found. Please run deps.sh and try again."> -+ <condition> -+ <not> -+ <available file="lib" type="dir" /> -+ </not> -+ </condition> -+ </fail> - <property name="init.done" - value="true"/> - </target> @@ -145,6 +152,7 @@ description="retrieve the dependencies" depends="init,init-ivy" ++++++ jedit.in ++++++ --- /var/tmp/diff_new_pack.x7v9OT/_old 2012-06-29 15:20:48.000000000 +0200 +++ /var/tmp/diff_new_pack.x7v9OT/_new 2012-06-29 15:20:48.000000000 +0200 @@ -1,21 +1,16 @@ #!/bin/sh # -# Runs jEdit -# -# You can specify which Java installation to use through the JAVA_HOME -# environment variable. Otherwise, this will look for Java in the -# system PATH. -# -# You can set a global value for JAVA_HOME in /etc/environment. +# jEdit start script +# JPackage Project <http://www.jpackage.org/> -if [ -z "$JAVA_HOME" ]; then - JAVA=`which java 2>/dev/null` - if [ -z "$JAVA" ]; then - echo "Failed to find the java virtual machine! Bailing..." - exit 1 - fi +# Source functions library +if [ -f /usr/share/java-utils/java-functions ] ; then + . /usr/share/java-utils/java-functions else - JAVA="$JAVA_HOME/bin/java" + echo "Can't find functions library, aborting" + exit 1 fi -exec "$JAVA" -jar @data/jedit.jar -reuseview "$@" +set_javacmd + +exec "${JAVACMD}" -jar @@DATADIR@@/jedit.jar "$@" ++++++ jedit4.5.0source.tar.bz2 -> jedit4.5.1source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/jedit/jedit4.5.0source.tar.bz2 /work/SRC/openSUSE:Factory/.jedit.new/jedit4.5.1source.tar.bz2 differ: char 1, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit frogr for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package frogr for openSUSE:12.2 checked in at 2012-06-29 15:15:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/frogr (Old) and /work/SRC/openSUSE:12.2/.frogr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frogr", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/frogr/frogr.changes 2012-06-25 15:19:19.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.frogr.new/frogr.changes 2012-06-29 15:16:00.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jun 29 13:15:00 CEST 2012 - vuntz(a)opensuse.org + +- Manually ship preferences-general.png as source: it's a picture + from the documentation, missing in the tarball. The fact that + it's missing creates a broken symlink, that makes the build of + bundle-lang-gnome-extras fail. +- Pass %{?no_lang_C} to %find_lang so that english documentation + ends in the main subpackage, instead of the lang subpackage. + +------------------------------------------------------------------- New: ---- preferences-general.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frogr.spec ++++++ --- /var/tmp/diff_new_pack.L26IDY/_old 2012-06-29 15:16:01.000000000 +0200 +++ /var/tmp/diff_new_pack.L26IDY/_new 2012-06-29 15:16:01.000000000 +0200 @@ -24,6 +24,7 @@ Group: Productivity/Graphics/Other Url: https://live.gnome.org/Frogr Source: http://download.gnome.org/sources/frogr/0.7/%{name}-%{version}.tar.xz +Source1: preferences-general.png BuildRequires: gnome-doc-utils-devel >= 0.10.13 BuildRequires: intltool BuildRequires: libgcrypt-devel @@ -49,6 +50,9 @@ %lang_package %prep %setup -q +# deal with picture from tarball; fixed in git +test ! -f help/C/figures/preferences-general.png +cp -a %{SOURCE1} help/C/figures/preferences-general.png %build %configure @@ -56,7 +60,7 @@ %install %make_install -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %suse_update_desktop_file frogr Viewer %clean @@ -81,6 +85,8 @@ %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README THANKS +%dir %{_datadir}/gnome/help/frogr +%doc %{_datadir}/gnome/help/frogr/C %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit frogr for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package frogr for openSUSE:Factory checked in at 2012-06-29 15:15:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frogr (Old) and /work/SRC/openSUSE:Factory/.frogr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frogr", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/frogr/frogr.changes 2012-06-05 15:30:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.frogr.new/frogr.changes 2012-06-29 15:15:58.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jun 29 13:15:00 CEST 2012 - vuntz(a)opensuse.org + +- Manually ship preferences-general.png as source: it's a picture + from the documentation, missing in the tarball. The fact that + it's missing creates a broken symlink, that makes the build of + bundle-lang-gnome-extras fail. +- Pass %{?no_lang_C} to %find_lang so that english documentation + ends in the main subpackage, instead of the lang subpackage. + +------------------------------------------------------------------- New: ---- preferences-general.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frogr.spec ++++++ --- /var/tmp/diff_new_pack.DiJM86/_old 2012-06-29 15:16:00.000000000 +0200 +++ /var/tmp/diff_new_pack.DiJM86/_new 2012-06-29 15:16:00.000000000 +0200 @@ -24,6 +24,7 @@ Group: Productivity/Graphics/Other Url: https://live.gnome.org/Frogr Source: http://download.gnome.org/sources/frogr/0.7/%{name}-%{version}.tar.xz +Source1: preferences-general.png BuildRequires: gnome-doc-utils-devel >= 0.10.13 BuildRequires: intltool BuildRequires: libgcrypt-devel @@ -49,6 +50,9 @@ %lang_package %prep %setup -q +# deal with picture from tarball; fixed in git +test ! -f help/C/figures/preferences-general.png +cp -a %{SOURCE1} help/C/figures/preferences-general.png %build %configure @@ -56,7 +60,7 @@ %install %make_install -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %suse_update_desktop_file frogr Viewer %clean @@ -81,6 +85,8 @@ %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README THANKS +%dir %{_datadir}/gnome/help/frogr +%doc %{_datadir}/gnome/help/frogr/C %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Crystalcursors for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package Crystalcursors for openSUSE:12.2 checked in at 2012-06-29 15:15:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/Crystalcursors (Old) and /work/SRC/openSUSE:12.2/.Crystalcursors.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Crystalcursors", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/Crystalcursors/Crystalcursors.changes 2012-06-25 15:14:22.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.Crystalcursors.new/Crystalcursors.changes 2012-06-29 15:15:16.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 29 07:03:28 UTC 2012 - coolo(a)suse.com + +- replace buildrequire xorg-x11 with the real require + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Crystalcursors.spec ++++++ --- /var/tmp/diff_new_pack.WJZm1q/_old 2012-06-29 15:15:16.000000000 +0200 +++ /var/tmp/diff_new_pack.WJZm1q/_new 2012-06-29 15:15:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package Crystalcursors # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,15 +16,15 @@ # - Name: Crystalcursors -BuildRequires: libpng xorg-x11 +BuildRequires: libpng +BuildRequires: xcursorgen Url: http://digilander.iol.it/m4rt/crystalcursors.html Summary: Mouse Cursors in Crystal Icon Style -Version: 0.5 -Release: 235 License: LGPL-2.1+ Group: System/X11/Icons +Version: 0.5 +Release: 0 Source: 6240-%{name}.tar.bz2 Patch: root-installation.diff Patch1: Crystalcursors.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Crystalcursors for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package Crystalcursors for openSUSE:Factory checked in at 2012-06-29 15:15:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Crystalcursors (Old) and /work/SRC/openSUSE:Factory/.Crystalcursors.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Crystalcursors", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/Crystalcursors/Crystalcursors.changes 2011-09-23 01:50:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Crystalcursors.new/Crystalcursors.changes 2012-06-29 15:15:10.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 29 07:03:28 UTC 2012 - coolo(a)suse.com + +- replace buildrequire xorg-x11 with the real require + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Crystalcursors.spec ++++++ --- /var/tmp/diff_new_pack.IRgu1B/_old 2012-06-29 15:15:12.000000000 +0200 +++ /var/tmp/diff_new_pack.IRgu1B/_new 2012-06-29 15:15:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package Crystalcursors # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,15 +16,15 @@ # - Name: Crystalcursors -BuildRequires: libpng xorg-x11 +BuildRequires: libpng +BuildRequires: xcursorgen Url: http://digilander.iol.it/m4rt/crystalcursors.html Summary: Mouse Cursors in Crystal Icon Style -Version: 0.5 -Release: 235 License: LGPL-2.1+ Group: System/X11/Icons +Version: 0.5 +Release: 0 Source: 6240-%{name}.tar.bz2 Patch: root-installation.diff Patch1: Crystalcursors.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package grub2 for openSUSE:12.2 checked in at 2012-06-29 14:19:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/grub2 (Old) and /work/SRC/openSUSE:12.2/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/grub2/grub2.changes 2012-06-29 06:59:52.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.grub2.new/grub2.changes 2012-06-29 14:19:09.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 29 10:02:08 UTC 2012 - dvaleev(a)suse.com + +- Add configuration support for serial terminal consoles. This will + set the maximum screen size so that text is not overwritten. + +------------------------------------------------------------------- +Fri Jun 29 09:51:59 UTC 2012 - dvaleev(a)suse.com + +- don't enable grub-emu-usb on ppc ppc641 + +------------------------------------------------------------------- New: ---- grub2-ppc-terminfo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.I0Wqas/_old 2012-06-29 14:19:10.000000000 +0200 +++ /var/tmp/diff_new_pack.I0Wqas/_new 2012-06-29 14:19:10.000000000 +0200 @@ -83,6 +83,7 @@ Patch4: grub2-linux-submenu.patch Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch7: grub2-install-opt-skip-fs-probe.patch +Patch8: grub2-ppc-terminfo.patch PreReq: perl-Bootloader Requires: gettext-runtime Requires: os-prober @@ -137,6 +138,7 @@ #%%patch4 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 cd .. # README.openSUSE @@ -186,12 +188,16 @@ %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu} %endif +%ifnarch ppc ppc64 +%define extraconfigure --enable-grub-emu-usb +%endif + # -static is needed so that autoconf script is able to link # test that looks for _start symbol on 64 bit platforms %configure TARGET_LDFLAGS=-static \ --target=%{_target_platform} \ --with-platform=%{platform} \ - --enable-grub-emu-usb \ + %{extraconfigure} \ --program-transform-name=s,grub,%{name}, make %{?_smp_mflags} @@ -317,7 +323,9 @@ %{_bindir}/%{name}-script-check %dir %{_libdir}/%{name}/ %dir %{_libdir}/%{name}/*/ +%ifnarch ppc ppc64 %{_libdir}/%{name}/*/*.image +%endif %{_libdir}/%{name}/*/*.img %{_libdir}/%{name}/*/*.lst %{_libdir}/%{name}/*/*.mod ++++++ grub2-ppc-terminfo.patch ++++++ >From e263907f50e496e602edd9bd846ccb6e0565a085 Mon Sep 17 00:00:00 2001 From: Mark Hamzy <hamzy(a)us.ibm.com> Date: Wed, 28 Mar 2012 14:46:41 -0500 Subject: [PATCH] Migrate PPC from Yaboot to Grub2 Add configuration support for serial terminal consoles. This will set the maximum screen size so that text is not overwritten. --- Makefile.util.def | 7 +++ util/grub.d/20_ppc_terminfo.in | 114 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 0 deletions(-) create mode 100644 util/grub.d/20_ppc_terminfo.in diff --git a/Makefile.util.def b/Makefile.util.def index c41b76e..b349758 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -423,6 +423,13 @@ script = { }; script = { + name = '20_ppc_terminfo'; + common = util/grub.d/20_ppc_terminfo.in; + installdir = grubconf; + condition = COND_HOST_LINUX; +}; + +script = { name = '30_os-prober'; common = util/grub.d/30_os-prober.in; installdir = grubconf; diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in new file mode 100644 index 0000000..10d6658 --- /dev/null +++ b/util/grub.d/20_ppc_terminfo.in @@ -0,0 +1,114 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see <http://www.gnu.org/licenses/>. + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libdir=@libdir@ +. "@datadir@/@PACKAGE@/grub-mkconfig_lib" + +export TEXTDOMAIN=@PACKAGE@ +export TEXTDOMAINDIR=@localedir@ + +X=80 +Y=24 +TERMINAL=ofconsole + +argument () { + opt=$1 + shift + + if test $# -eq 0; then + echo "$0: option requires an argument -- '$opt'" 1>&2 + exit 1 + fi + echo $1 +} + +check_terminfo () { + + while test $# -gt 0 + do + option=$1 + shift + + case "$option" in + terminfo | TERMINFO) + ;; + + -g) + NEWXY=`argument $option "$@"` + NEWX=`echo $NEWXY | cut -d x -f 1` + NEWY=`echo $NEWXY | cut -d x -f 2` + + if [ ${NEWX} -ge 80 ] ; then + X=${NEWX} + else + echo "Warning: ${NEWX} is less than the minimum size of 80" + fi + + if [ ${NEWY} -ge 24 ] ; then + Y=${NEWY} + else + echo "Warning: ${NEWY} is less than the minimum size of 24" + fi + + shift + ;; + + *) +# # accept console or ofconsole +# if [ "$option" != "console" -a "$option" != "ofconsole" ] ; then +# echo "Error: GRUB_TERMINFO unknown console: $option" +# exit 1 +# fi +# # perfer console +# TERMINAL=console + # accept ofconsole + if [ "$option" != "ofconsole" ] ; then + echo "Error: GRUB_TERMINFO unknown console: $option" + exit 1 + fi + # perfer console + TERMINAL=ofconsole + ;; + esac + + done + +} + +if ! uname -m | grep -q ppc ; then + exit 0 +fi + +if [ "x${GRUB_TERMINFO}" != "x" ] ; then + F1=`echo ${GRUB_TERMINFO} | cut -d " " -f 1` + + if [ "${F1}" != "terminfo" ] ; then + echo "Error: GRUB_TERMINFO is set to \"${GRUB_TERMINFO}\" The first word should be terminfo." + exit 1 + fi + + check_terminfo ${GRUB_TERMINFO} +fi + +cat << EOF + terminfo -g ${X}x${Y} ${TERMINAL} +EOF -- 1.7.7.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2012-06-29 14:19:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2012-06-29 06:59:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2012-06-29 14:19:04.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 29 10:02:08 UTC 2012 - dvaleev(a)suse.com + +- Add configuration support for serial terminal consoles. This will + set the maximum screen size so that text is not overwritten. + +------------------------------------------------------------------- +Fri Jun 29 09:51:59 UTC 2012 - dvaleev(a)suse.com + +- don't enable grub-emu-usb on ppc ppc641 + +------------------------------------------------------------------- New: ---- grub2-ppc-terminfo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.ZCKQUu/_old 2012-06-29 14:19:06.000000000 +0200 +++ /var/tmp/diff_new_pack.ZCKQUu/_new 2012-06-29 14:19:06.000000000 +0200 @@ -83,6 +83,7 @@ Patch4: grub2-linux-submenu.patch Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch7: grub2-install-opt-skip-fs-probe.patch +Patch8: grub2-ppc-terminfo.patch PreReq: perl-Bootloader Requires: gettext-runtime Requires: os-prober @@ -137,6 +138,7 @@ #%%patch4 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 cd .. # README.openSUSE @@ -186,12 +188,16 @@ %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu} %endif +%ifnarch ppc ppc64 +%define extraconfigure --enable-grub-emu-usb +%endif + # -static is needed so that autoconf script is able to link # test that looks for _start symbol on 64 bit platforms %configure TARGET_LDFLAGS=-static \ --target=%{_target_platform} \ --with-platform=%{platform} \ - --enable-grub-emu-usb \ + %{extraconfigure} \ --program-transform-name=s,grub,%{name}, make %{?_smp_mflags} @@ -317,7 +323,9 @@ %{_bindir}/%{name}-script-check %dir %{_libdir}/%{name}/ %dir %{_libdir}/%{name}/*/ +%ifnarch ppc ppc64 %{_libdir}/%{name}/*/*.image +%endif %{_libdir}/%{name}/*/*.img %{_libdir}/%{name}/*/*.lst %{_libdir}/%{name}/*/*.mod ++++++ grub2-ppc-terminfo.patch ++++++ >From e263907f50e496e602edd9bd846ccb6e0565a085 Mon Sep 17 00:00:00 2001 From: Mark Hamzy <hamzy(a)us.ibm.com> Date: Wed, 28 Mar 2012 14:46:41 -0500 Subject: [PATCH] Migrate PPC from Yaboot to Grub2 Add configuration support for serial terminal consoles. This will set the maximum screen size so that text is not overwritten. --- Makefile.util.def | 7 +++ util/grub.d/20_ppc_terminfo.in | 114 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 0 deletions(-) create mode 100644 util/grub.d/20_ppc_terminfo.in diff --git a/Makefile.util.def b/Makefile.util.def index c41b76e..b349758 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -423,6 +423,13 @@ script = { }; script = { + name = '20_ppc_terminfo'; + common = util/grub.d/20_ppc_terminfo.in; + installdir = grubconf; + condition = COND_HOST_LINUX; +}; + +script = { name = '30_os-prober'; common = util/grub.d/30_os-prober.in; installdir = grubconf; diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in new file mode 100644 index 0000000..10d6658 --- /dev/null +++ b/util/grub.d/20_ppc_terminfo.in @@ -0,0 +1,114 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see <http://www.gnu.org/licenses/>. + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libdir=@libdir@ +. "@datadir@/@PACKAGE@/grub-mkconfig_lib" + +export TEXTDOMAIN=@PACKAGE@ +export TEXTDOMAINDIR=@localedir@ + +X=80 +Y=24 +TERMINAL=ofconsole + +argument () { + opt=$1 + shift + + if test $# -eq 0; then + echo "$0: option requires an argument -- '$opt'" 1>&2 + exit 1 + fi + echo $1 +} + +check_terminfo () { + + while test $# -gt 0 + do + option=$1 + shift + + case "$option" in + terminfo | TERMINFO) + ;; + + -g) + NEWXY=`argument $option "$@"` + NEWX=`echo $NEWXY | cut -d x -f 1` + NEWY=`echo $NEWXY | cut -d x -f 2` + + if [ ${NEWX} -ge 80 ] ; then + X=${NEWX} + else + echo "Warning: ${NEWX} is less than the minimum size of 80" + fi + + if [ ${NEWY} -ge 24 ] ; then + Y=${NEWY} + else + echo "Warning: ${NEWY} is less than the minimum size of 24" + fi + + shift + ;; + + *) +# # accept console or ofconsole +# if [ "$option" != "console" -a "$option" != "ofconsole" ] ; then +# echo "Error: GRUB_TERMINFO unknown console: $option" +# exit 1 +# fi +# # perfer console +# TERMINAL=console + # accept ofconsole + if [ "$option" != "ofconsole" ] ; then + echo "Error: GRUB_TERMINFO unknown console: $option" + exit 1 + fi + # perfer console + TERMINAL=ofconsole + ;; + esac + + done + +} + +if ! uname -m | grep -q ppc ; then + exit 0 +fi + +if [ "x${GRUB_TERMINFO}" != "x" ] ; then + F1=`echo ${GRUB_TERMINFO} | cut -d " " -f 1` + + if [ "${F1}" != "terminfo" ] ; then + echo "Error: GRUB_TERMINFO is set to \"${GRUB_TERMINFO}\" The first word should be terminfo." + exit 1 + fi + + check_terminfo ${GRUB_TERMINFO} +fi + +cat << EOF + terminfo -g ${X}x${Y} ${TERMINAL} +EOF -- 1.7.7.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit erlang for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package erlang for openSUSE:12.2 checked in at 2012-06-29 14:12:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/erlang (Old) and /work/SRC/openSUSE:12.2/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "erlang", Maintainer is "CThiel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/erlang/erlang.changes 2012-06-25 15:18:23.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.erlang.new/erlang.changes 2012-06-29 14:12:59.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 29 09:54:00 UTC 2012 - idonmez(a)suse.com + +- Fix build with OpenDJK7, -target parameter no longer sets + -source so we have to do it manually. + +------------------------------------------------------------------- +Tue Jun 26 13:46:36 UTC 2012 - mvyskocil(a)suse.cz + +- Simply use java-devel >= 1.6.0 as it expands to correct jdk on every + distribution + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.CjnR2B/_old 2012-06-29 14:13:02.000000000 +0200 +++ /var/tmp/diff_new_pack.CjnR2B/_new 2012-06-29 14:13:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package erlang # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,14 +16,13 @@ # - Name: erlang Version: R14B04 Release: 0 -License: ErlPL-1.1 Summary: General-purpose programming language and runtime environment -Url: http://www.erlang.org +License: ErlPL-1.1 Group: Development/Languages/Other +Url: http://www.erlang.org Source: otp_src_%{version}.tar.gz #Source: http://www.erlang.org/download/otp_src_%{version}.tar.gz Source1: otp_doc_html_%{version}.tar.gz @@ -45,12 +44,8 @@ BuildRequires: tk-devel BuildRequires: unixODBC-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1140 -BuildRequires: java-1_6_0-openjdk-devel -%else -BuildRequires: java-devel >= 1.5.0 -%endif BuildRequires: Mesa-devel +BuildRequires: java-devel >= 1.6.0 BuildRequires: krb5-devel %if 0%{?sles_version} >= 10 BuildRequires: update-alternatives @@ -97,7 +92,7 @@ %package doc Summary: Erlang documentation Group: Development/Languages/Other -Recommends: %{name} = %{version} +Requires: %{name} = %{version} %description doc Documentation for Erlang. @@ -205,7 +200,7 @@ # we need build only 1.5 target for java # for SLE only %if 0%{?sles_version} >= 10 || 0%{?suse_version} >= 1110 - export JAVAC="javac -target 1.5" + export JAVAC="javac -source 1.5 -target 1.5" %endif %if 0%{?suse_version} == 1100 || 0%{?fedora_version} == 9 export CFLAGS="-fno-strict-aliasing" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit erlang for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package erlang for openSUSE:Factory checked in at 2012-06-29 14:12:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang (Old) and /work/SRC/openSUSE:Factory/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "erlang", Maintainer is "CThiel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2011-11-14 11:50:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2012-06-29 14:12:54.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 29 09:54:00 UTC 2012 - idonmez(a)suse.com + +- Fix build with OpenDJK7, -target parameter no longer sets + -source so we have to do it manually. + +------------------------------------------------------------------- +Tue Jun 26 13:46:36 UTC 2012 - mvyskocil(a)suse.cz + +- Simply use java-devel >= 1.6.0 as it expands to correct jdk on every + distribution + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.64sNZr/_old 2012-06-29 14:12:58.000000000 +0200 +++ /var/tmp/diff_new_pack.64sNZr/_new 2012-06-29 14:12:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package erlang # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,14 +16,13 @@ # - Name: erlang Version: R14B04 Release: 0 -License: ErlPL-1.1 Summary: General-purpose programming language and runtime environment -Url: http://www.erlang.org +License: ErlPL-1.1 Group: Development/Languages/Other +Url: http://www.erlang.org Source: otp_src_%{version}.tar.gz #Source: http://www.erlang.org/download/otp_src_%{version}.tar.gz Source1: otp_doc_html_%{version}.tar.gz @@ -45,12 +44,8 @@ BuildRequires: tk-devel BuildRequires: unixODBC-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1140 -BuildRequires: java-1_6_0-openjdk-devel -%else -BuildRequires: java-devel >= 1.5.0 -%endif BuildRequires: Mesa-devel +BuildRequires: java-devel >= 1.6.0 BuildRequires: krb5-devel %if 0%{?sles_version} >= 10 BuildRequires: update-alternatives @@ -97,7 +92,7 @@ %package doc Summary: Erlang documentation Group: Development/Languages/Other -Recommends: %{name} = %{version} +Requires: %{name} = %{version} %description doc Documentation for Erlang. @@ -205,7 +200,7 @@ # we need build only 1.5 target for java # for SLE only %if 0%{?sles_version} >= 10 || 0%{?suse_version} >= 1110 - export JAVAC="javac -target 1.5" + export JAVAC="javac -source 1.5 -target 1.5" %endif %if 0%{?suse_version} == 1100 || 0%{?fedora_version} == 9 export CFLAGS="-fno-strict-aliasing" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0