suppressed almost all rpmlint messages and added some fixes, mentioned in
merge review
This commit is contained in:
Peter Lemenkov
parent
06e4ee0f7b
commit
6c9383e926
1
import.log
Normal file
1
import.log
Normal file
@ -0,0 +1 @@
|
||||
unixODBC-2_2_14-4_fc10:HEAD:unixODBC-2.2.14-4.fc10.src.rpm:1244546569
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: A complete ODBC driver manager for Linux
|
||||
Name: unixODBC
|
||||
Version: 2.2.14
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.unixODBC.org/
|
||||
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
|
||||
@ -24,6 +24,7 @@ Conflicts: iodbc
|
||||
BuildRequires: libX11-devel libXt-devel libXext-devel
|
||||
BuildRequires: qt3-devel readline-devel
|
||||
BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
|
||||
%description
|
||||
@ -59,6 +60,12 @@ This package contains components for the ODBCConfig and DataManager
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
chmod 0644 Drivers/MiniSQL/*.c
|
||||
chmod 0644 Drivers/nn/*.c
|
||||
chmod 0644 Drivers/template/*.c
|
||||
chmod 0644 doc/ProgrammerManual/Tutorial/*.html
|
||||
chmod 0644 doc/lst/*
|
||||
chmod 0644 include/odbcinst.h
|
||||
|
||||
# Blow away the embedded libtool and replace with build system's libtool.
|
||||
# (We will use the installed libtool anyway, but this makes sure they match.)
|
||||
@ -92,26 +99,28 @@ export QTDIR=
|
||||
. /etc/profile.d/qt.sh
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
|
||||
%makeinstall
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
install -m644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications
|
||||
install -m644 %{SOURCE3} $RPM_BUILD_ROOT/usr/share/applications
|
||||
cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
cp DataManager/ODBC.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/odbc.xpm
|
||||
cp DataManagerII/LinuxODBC.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
cp DataManagerII/ODBC.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/odbc.xpm
|
||||
cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
cp DataManager/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/odbc.xpm
|
||||
cp DataManagerII/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
cp DataManagerII/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/odbc.xpm
|
||||
|
||||
# installing *.desktop files
|
||||
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
|
||||
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
|
||||
|
||||
# multilib header hacks
|
||||
# we only apply this to known Red Hat multilib arches, per bug #181335
|
||||
case `uname -i` in
|
||||
i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 )
|
||||
mv $RPM_BUILD_ROOT/usr/include/unixodbc_conf.h $RPM_BUILD_ROOT/usr/include/unixodbc_conf_`uname -i`.h
|
||||
mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h
|
||||
rm -f unixodbc_conf.h
|
||||
sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
|
||||
install -m 644 unixodbc_conf.h $RPM_BUILD_ROOT/usr/include/
|
||||
install -m 644 unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
@ -134,7 +143,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||
# remove unpackaged files from the buildroot
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.*
|
||||
rm -rf $RPM_BUILD_ROOT/usr/share/libtool
|
||||
rm -rf $RPM_BUILD_ROOT%{_datadir}/libtool
|
||||
|
||||
# initialize lists of .so files; note that libodbcinstQ* go into kde subpkg
|
||||
find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" | grep -v /libodbcinstQ > base-so-list
|
||||
@ -153,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f base-so-list
|
||||
%defattr(-,root,root)
|
||||
%doc README COPYING AUTHORS ChangeLog NEWS INSTALL doc
|
||||
%doc README COPYING AUTHORS ChangeLog NEWS doc
|
||||
%config(noreplace) %{_sysconfdir}/odbc*
|
||||
%{_bindir}/odbcinst
|
||||
%{_bindir}/isql
|
||||
@ -171,10 +180,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/DataManager
|
||||
%{_bindir}/DataManagerII
|
||||
%{_bindir}/odbctest
|
||||
/usr/share/applications/ODBCConfig.desktop
|
||||
/usr/share/applications/DataManager.desktop
|
||||
/usr/share/pixmaps/LinuxODBC.xpm
|
||||
/usr/share/pixmaps/odbc.xpm
|
||||
%{_datadir}/applications/ODBCConfig.desktop
|
||||
%{_datadir}/applications/DataManager.desktop
|
||||
%{_datadir}/pixmaps/LinuxODBC.xpm
|
||||
%{_datadir}/pixmaps/odbc.xpm
|
||||
%{_libdir}/libodbcinstQ*so
|
||||
%{_libdir}/libodbcinstQ*so.*
|
||||
|
||||
@ -185,6 +194,13 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Tue Jun 9 2009 Peter Lemenkov <lemenkov@gmail.com> - 2.2.14-4
|
||||
- Properly install *.desktop files
|
||||
- No need to ship INSTALL in docs
|
||||
- Use macros instead of hardcoded /usr/share and /usr/include
|
||||
- fixed permissions on some doc- and src-files
|
||||
- Almost all rpmlint messages are gone now
|
||||
|
||||
* Sat Jun 06 2009 Dennis Gilmore <dennis@ausil.us> - 2.2.14-3
|
||||
- add sparc support to the multilib includes header
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user