Hello community, here is the log from the commit of package dx checked in at Wed May 30 01:05:05 CEST 2007. -------- --- dx/dx.changes 2007-05-23 17:02:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/dx/dx.changes 2007-05-29 19:20:04.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 29 19:18:32 CEST 2007 - lmichnovic@suse.cz + +- splitted off devel sub package +- fixed strange name of man page and installing to %_mandir + (manpage.patch) +- using Recommends tag for subpackages +- using fdupes +- defining includedir and libdir of X due to change of prefix in + X.org 7.x + +------------------------------------------------------------------- New: ---- dx-4.4.4-manpage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dx.spec ++++++ --- /var/tmp/diff_new_pack.P13267/_old 2007-05-30 01:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.P13267/_new 2007-05-30 01:01:56.000000000 +0200 @@ -16,8 +16,9 @@ %if %suse_version > 1000 BuildRequires: libdrm-devel %endif +BuildRequires: fdupes Version: 4.4.4 -Release: 57 +Release: 58 Summary: IBM Open Visualization Data Explorer License: IBM Public License Group: Productivity/Graphics/Visualization/Other @@ -35,10 +36,12 @@ Patch5: dx-%{version}-return_value.patch Patch6: dx-%{version}-increment.patch Patch7: dx-%{version}-undefined_code.patch +Patch8: dx-%{version}-manpage.patch Patch20: dxsamples-%{samplesversion}-java.patch Patch21: dxsamples-%{samplesversion}-DESTDIR.patch Patch22: dxsamples-%{samplesversion}-rights.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: dx-data=%{version}, dx-doc=%{version}, dx-devel=%{version} %description The Open Visualization Data Explorer is a visualization framework that @@ -57,7 +60,7 @@ Summary: Additional Package Documentation for dx Group: Productivity/Graphics/Visualization/Other Provides: dxdoc -Requires: dx +Requires: dx=%{version} Obsoletes: dxdoc %description doc @@ -74,9 +77,9 @@ Summary: Sample data for the IBM Open Visualization Data Explorer Group: Productivity/Graphics/Visualization/Other Provides: dxdata -Requires: dx +Requires: dx=%{version} Obsoletes: dxdata -Autoreqprov: no +Autoreqprov: on %description data This package contains some sample data for the IBM Open Visualization @@ -88,6 +91,22 @@ -------- (C) COPYRIGHT International Business Machines Corp. 1991-1997 +%package devel +Summary: Headers, static libs and source code files for the IBM Open Visualization Data Explorer +Group: Productivity/Graphics/Visualization/Other +Requires: dx=%{version} +Autoreqprov: on + +%description devel +This package contains header C files, static libraries and source code +files for the IBM Open Visualization Data Explorer. + + + +Authors: +-------- + (C) COPYRIGHT International Business Machines Corp. 1991-1997 + %prep %setup -q -b 1 %patch0 @@ -98,7 +117,12 @@ %patch5 %patch6 %patch7 -# +%patch8 +# gzip the man page and rename it correctly +# when doing this be sure patch8 (*manpage.patch) is applied +mv man/manl/dx.l man/manl/dx.1 +gzip -9 man/manl/dx.1 +# samples cd ../dxsamples-%{samplesversion} %patch20 %patch21 @@ -110,10 +134,17 @@ aclocal autoheader automake -a -i +# automake doing strange things in Makefile.in, fixing in install: autoconf +%if "%(xft-config --prefix)" == "/usr" CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fsigned-char" \ CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -fno-strict-aliasing -fsigned-char" \ -./configure --prefix=/opt --bindir=%{_prefix}/bin/ --libdir=%{_libdir} +./configure --prefix=/opt --x-includes=/usr/include --x-libraries=%{_libdir} +%else +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fsigned-char" \ +CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -fno-strict-aliasing -fsigned-char" \ +./configure --prefix=/opt +%endif # don't use make %{?jobs:-j%jobs}, it will fail make # @@ -144,25 +175,36 @@ 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 +# workaround for that strange renaming in Makefile.in made by autoconf +mv $RPM_BUILD_ROOT/usr/share/man/mang $RPM_BUILD_ROOT/usr/share/man/man1 %suse_update_desktop_file -i dx Education Science Math +%fdupes -s $RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,755) %doc AUTHORS COPYING ChangeLog LICENSE NEWS README* +%doc /usr/share/man/man1/dx.1.gz /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/ +# .la files go into devel %exclude /opt/dx/lib_linux/*.la +# header files goes into devel +%exclude /opt/dx/include +# .la files go into devel +%exclude /opt/dx/lib_linux +# source code goes into devel +%exclude /opt/dx/lib/outboard.c /opt/dx/man/ /opt/dx/ui/ %dir /opt/dx/ @@ -175,8 +217,31 @@ %files data %defattr(-,root,root,755) /opt/dx/samples/ +# source code files goes into devel +%exclude /opt/dx/samples/*/*.c +%exclude /opt/dx/samples/*/*/*.c +%exclude /opt/dx/samples/*/*/*.h +%exclude /opt/dx/samples/*/*/*/*.c + +%files devel +%defattr(-,root,root,755) +/opt/dx/include +/opt/dx/lib_linux +/opt/dx/lib/outboard.c +/opt/dx/samples/*/*.c +/opt/dx/samples/*/*/*.c +/opt/dx/samples/*/*/*.h +/opt/dx/samples/*/*/*/*.c %changelog +* Tue May 29 2007 - lmichnovic@suse.cz +- splitted off devel sub package +- fixed strange name of man page and installing to %%_mandir + (manpage.patch) +- using Recommends tag for subpackages +- using fdupes +- defining includedir and libdir of X due to change of prefix in + X.org 7.x * Wed May 23 2007 - lmichnovic@suse.cz - installing to /opt (it is O.K. with FHS) * Fri Apr 27 2007 - lmichnovic@suse.cz ++++++ dx-4.4.4-manpage.patch ++++++ --- man/manl/Makefile.am +++ man/manl/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -mandir = $(prefix)/dx/man +mandir = /usr/share/man -man_MANS = dx.l +man_MANS = dx.1.gz EXTRA_DIST = $(man_MANS) --- man/manl/Makefile.in +++ man/manl/Makefile.in @@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ yakker = @yakker@ -man_MANS = dx.l +man_MANS = dx.1.gz EXTRA_DIST = $(man_MANS) all: all-am ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org