Hello community, here is the log from the commit of package dx checked in at Thu Feb 15 18:23:21 CET 2007. -------- --- dx/dx.changes 2007-01-23 12:11:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/dx/dx.changes 2007-02-15 17:38:15.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Feb 15 17:37:44 CET 2007 - lmichnovic@suse.cz + +- fixed bindir to /usr/bin (bindir.patch) + +------------------------------------------------------------------- +Tue Feb 13 18:10:28 CET 2007 - lmichnovic@suse.cz + +- moved from /opt to /usr/share + +------------------------------------------------------------------- New: ---- dx-4.4.4-bindir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dx.spec ++++++ --- /var/tmp/diff_new_pack.J18417/_old 2007-02-15 18:22:57.000000000 +0100 +++ /var/tmp/diff_new_pack.J18417/_new 2007-02-15 18:22:57.000000000 +0100 @@ -12,9 +12,12 @@ Name: dx %define samplesversion 4.4.0 -BuildRequires: freeglut-devel freetype2-devel gcc-c++ libdrm-devel libpng-devel libtiff-devel openmotif openmotif-devel tcsh update-desktop-files +BuildRequires: freeglut-devel freetype2-devel gcc-c++ libpng-devel libtiff-devel openmotif openmotif-devel tcsh update-desktop-files +%if %suse_version > 1000 +BuildRequires: libdrm-devel +%endif Version: 4.4.4 -Release: 31 +Release: 35 Summary: IBM Open Visualization Data Explorer License: IBM Public License Group: Productivity/Graphics/Visualization/Other @@ -32,6 +35,7 @@ Patch5: dx-%{version}-return_value.patch Patch6: dx-%{version}-increment.patch Patch7: dx-%{version}-undefined_code.patch +Patch8: dx-%{version}-bindir.patch Patch20: dxsamples-%{samplesversion}-java.patch Patch21: dxsamples-%{samplesversion}-DESTDIR.patch Patch22: dxsamples-%{samplesversion}-rights.patch @@ -95,6 +99,7 @@ %patch5 %patch6 %patch7 +%patch8 # cd ../dxsamples-%{samplesversion} %patch20 @@ -110,7 +115,7 @@ autoconf CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fsigned-char" \ CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -fno-strict-aliasing -fsigned-char" \ -./configure --prefix=/opt +./configure --prefix=%{_prefix}/share --bindir=%{_prefix}/bin/ --libdir=%{_libdir} # don't use make %{?jobs:-j%jobs}, it will fail make # @@ -123,24 +128,25 @@ automake -a -i autoconf CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=/opt +./configure --prefix=%{_prefix}/share # don't use make %{?jobs:-j%jobs}, it will fail make %install make DESTDIR=$RPM_BUILD_ROOT \ - prefix=/opt \ + prefix=%{_prefix}/share \ install # # dx samples cd $RPM_BUILD_DIR/dxsamples-%{samplesversion} make DESTDIR=$RPM_BUILD_ROOT \ - prefix=/opt \ + prefix=%{_prefix}/share \ install # -install -d $RPM_BUILD_ROOT/usr/bin -ln -sf /opt/dx/bin/dx $RPM_BUILD_ROOT/usr/bin/dx -rm -f $RPM_BUILD_ROOT/opt/bin/dx +#install -d $RPM_BUILD_ROOT/usr/bin +# installing now directly, see *bindir.patch +#ln -sf /opt/dx/bin/dx $RPM_BUILD_ROOT/usr/bin/dx +#rm -f $RPM_BUILD_ROOT/opt/bin/dx %suse_update_desktop_file -i dx Education Science Math %clean @@ -151,29 +157,33 @@ %doc AUTHORS COPYING ChangeLog LICENSE NEWS README* /usr/bin/dx /usr/share/applications/dx.desktop -/opt/dx/bin/ -/opt/dx/bin_linux/ -/opt/dx/fonts/ -/opt/dx/help/ -/opt/dx/include/ -/opt/dx/java/ -/opt/dx/lib/ -/opt/dx/lib_linux/ -%exclude /opt/dx/lib_linux/*.la -/opt/dx/man/ -/opt/dx/ui/ -%dir /opt/dx/ +%{_prefix}/share/dx/bin/ +%{_prefix}/share/dx/bin_linux/ +%{_prefix}/share/dx/fonts/ +%{_prefix}/share/dx/help/ +%{_prefix}/share/dx/include/ +%{_prefix}/share/dx/java/ +%{_prefix}/share/dx/lib/ +%{_prefix}/share/dx/lib_linux/ +%exclude %{_prefix}/share/dx/lib_linux/*.la +%{_prefix}/share/dx/man/ +%{_prefix}/share/dx/ui/ +%dir %{_prefix}/share/dx/ %files doc %defattr(-,root,root,755) -/opt/dx/doc/ -/opt/dx/html/ +%{_prefix}/share/dx/doc/ +%{_prefix}/share/dx/html/ %files data %defattr(-,root,root,755) -/opt/dx/samples/ +%{_prefix}/share/dx/samples/ %changelog -n dx +* Thu Feb 15 2007 - lmichnovic@suse.cz +- fixed bindir to /usr/bin (bindir.patch) +* Tue Feb 13 2007 - lmichnovic@suse.cz +- moved from /opt to /usr/share * Tue Jan 23 2007 - lmichnovic@suse.cz - fixed uninitialized matrix (added to uninitialized_var.patch) - fixed undefined evaluation of code (undefined_code.patch) ++++++ dx-4.4.4-bindir.patch ++++++ --- bin/Makefile.am +++ bin/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in dxbindir = $(prefix)/dx/bin -bindir = $(prefix)/bin +bindir = /usr/bin EXTRA_SCRIPTS = mdf2c dx EXTRA_DIST = url_handler.sh --- bin/Makefile.in +++ bin/Makefile.in @@ -168,7 +168,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ -bindir = $(prefix)/bin +bindir = bsh_path = @bsh_path@ build = @build@ build_alias = @build_alias@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org