Author: wyoung
Date: Mon Mar 19 13:36:19 2007
New Revision: 1455
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1455&view=rev
Log:
Merged much of the diffs between Remi Collet's spec file into the
official one. Still working on resolving the remaining differences.
Modified:
trunk/CREDITS
trunk/mysql++.spec.in
Modified: trunk/CREDITS
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/CREDITS?rev=1455&r1=1454&r2=1455&view=diff
==============================================================================
--- trunk/CREDITS (original)
+++ trunk/CREDITS Mon Mar 19 13:36:19 2007
@@ -18,9 +18,6 @@
Also, if there were a "steering committee" for MySQL++, he'd be
on it.
- Totte Karlsson <[EMAIL PROTECTED]>: Primary force behind Borland
- C++ Builder support.
-
Mark Meredino <[EMAIL PROTECTED]>: Several fixes and
additions, including a lot of work on Microsoft Visual C++
compatibility, and discoveries made while spelunking in the
@@ -35,6 +32,10 @@
Korolyov Ilya has submitted several patches in many different
areas of the library.
+
+ Remi Collet <[EMAIL PROTECTED]> is maintaining offical
+ RPMs for Fedora, with other systems on the way. His work has
+ improved the RPM spec file we distribute greatly.
Here are the personal credits from the old 1.7.9 documentation,
Modified: trunk/mysql++.spec.in
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.spec.in?rev=1455&r1=1454&r2=1455&view=diff
==============================================================================
--- trunk/mysql++.spec.in (original)
+++ trunk/mysql++.spec.in Mon Mar 19 13:36:19 2007
@@ -1,12 +1,14 @@
-Summary: C++ wrapper for the MySQL C API
-Name: @PACKAGE_NAME@
-Version: @PACKAGE_VERSION@
-Release: 1
-Copyright: LGPL
-Group: Development/Databases
-Requires: MySQL-shared
-Source: http://tangentsoft.net/mysql++/releases/mysql++-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-buildroot
+Summary: C++ wrapper for the MySQL C API
+Name: @PACKAGE_NAME@
+Version: @PACKAGE_VERSION@
+Release: 3
+License: LGPL
+Group: Development/Libraries
+URL: http://tangentsoft.net/mysql++/
+Source0: http://tangentsoft.net/mysql++/releases/mysql++-%{version}.tar.gz
+BuildRoot: /var/tmp/%{name}-buildroot
+BuildRequires: MySQL-shared-compat
+
%description
MySQL++ makes working with MySQL server queries as easy as working
with STL containers. This package contains only the libraries needed to
@@ -14,75 +16,113 @@
programs, you also need to install the -devel package.
%package devel
-Summary: MySQL++ developer files (headers, examples, etc.)
-Group: Development/Databases
-Requires: mysql++
+Summary: MySQL++ developer files (headers, examples, etc.)
+Group: Development/Libraries
+Requires: mysql++ = %{version}-%{release}
+
%description devel
These are the files needed to compile MySQL++ based programs, plus
some sample code to get you started. If you aren't building your own
programs, you probably don't need to install this package.
%package manuals
-Summary: MySQL++ user and reference manuals
-Group: Development/Databases
+Summary: MySQL++ user and reference manuals
+Group: Development/Libraries
+
%description manuals
This is the MySQL++ documentation. It's a separate RPM just because
it's so large, and it doesn't change with every release.
%prep
%setup -q
-./configure --prefix=/usr --disable-dependency-tracking
%build
-%{__make} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%{__make} %{?_smp_mflags}
+%configure --disable-dependency-tracking
%install
-rm -rf $RPM_BUILD_ROOT
-BDIR=$RPM_BUILD_ROOT/usr
-LIBDIR=$BDIR/lib
-INCDIR=$BDIR/include
-EXDIR=$BDIR/src/mysql++/examples
-mkdir -p $LIBDIR
-mkdir -p $INCDIR
-mkdir -p $EXDIR
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-install -m644 examples/*.{cpp,h} exrun $EXDIR
-install -m644 Makefile.simple $EXDIR/Makefile
-cp README.examples doc
-cp LICENSE doc
-mv doc/README.mysql++ doc/README
-mv $LIBDIR/*.so $LIBDIR/libmysqlpp.so.%{version}
+rm -rf %{buildroot} doc/examples doc/html
+
+%{__mkdir_p} %{buildroot}{%{_libdir},%{_includedir}}
+
+%{__make} DESTDIR=%{buildroot} install
+
+# Copy example programs to doc directory
+%{__mkdir_p} doc/examples
+%{__install} -m644 examples/*.{cpp,h} doc/examples/
+
+# Fix up simple example Makefile to allow it to build on the install
+# system, as opposed to the system where the Makefile was created.
+%{__sed} -e '[EMAIL PROTECTED]/examples/@@' \
+ -e '[EMAIL PROTECTED] [EMAIL PROTECTED] = $(shell mysql_config --cflags)@' \
+ -e '[EMAIL PROTECTED] [EMAIL PROTECTED] = $(shell mysql_config --libs)@' \
+ -e 's@ -Ilib -I/usr/include/mysql@@' \
+ Makefile.simple > doc/examples/Makefile
%clean
-rm -rf $RPM_BUILD_ROOT
-rm -f doc/README.examples doc/LICENSE
+rm -rf %{buildroot} doc/examples
-%post
- ln -sf /usr/lib/libmysqlpp.so.%{version} /usr/lib/libmysqlpp.so
- /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun
- rm /usr/lib/libmysqlpp.so
- /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc doc/LICENSE doc/README
-
-/usr/lib/libmysqlpp.*
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING CREDITS LICENSE README
+%{_libdir}/libmysqlpp.so.*
%files devel
-%defattr(-,root,root)
-%doc doc/README.devel doc/README.examples
-
-/usr/include/mysql++
-/usr/src/mysql++/examples
+%defattr(-,root,root,-)
+%doc doc/examples doc/README.devel README.examples Wishlist
+%{_includedir}/mysql++
+%{_libdir}/libmysqlpp.so
%files manuals
-%defattr(-,root,root)
-%doc doc/*.pdf doc/refman doc/userman
+%defattr(-,root,root,-)
+%doc doc/*.pdf doc/README.manuals doc/refman doc/userman
%changelog
+* Mon Mar 19 2007 Warren Young <[EMAIL PROTECTED]> 2.2.1-3
+- Initial merge of Remi Collet's spec file with official one
+
+* Sun Mar 18 2007 Remi Collet <[EMAIL PROTECTED]> 2.2.1-2
+- find perm on common.h
+- soname mysql++-2.2.1-bkl.patch
+
+* Wed Feb 28 2007 Remi Collet <[EMAIL PROTECTED]> 2.2.1-1
+- Initial spec for Extras
+
+* Wed Feb 28 2007 Remi Collet <[EMAIL PROTECTED]> 2.2.1-1.fc{3-6}.remi
+- update to version 2.2.1
+
+* Thu Jan 25 2007 Remi Collet <[EMAIL PROTECTED]> 2.2.0-1.fc{3-6}.remi
+- update to version 2.2.0
+
+* Mon Nov 13 2006 Remi Collet <[EMAIL PROTECTED]> 2.1.1.fc6.remi
+- FC6.x86_64 build
+- dynamic (sed) patch for Makefile (use mysql_config)
+
+* Thu Nov 02 2006 Remi Collet <[EMAIL PROTECTED]> 2.1.1.fc6.remi
+- FC6 build
+
+* Sat Apr 8 2006 Remi Collet <[EMAIL PROTECTED]> 2.1.1.fc{3,4,5}.remi
+- update to version 2.1.1
+
+* Sat Nov 26 2005 Remi Collet <[EMAIL PROTECTED]> 2.0.7-1.fc3.remi -
2.0.7-1.fc4.remi
+- update to version 2.0.4
+- build with mysql-5.0.15 (requires libmysqlclient.so.15)
+
+* Sun Sep 4 2005 Remi Collet <[EMAIL PROTECTED]> 2.0.4-1.FC4.remi
+- version 2.0.4
+
+* Sat Aug 20 2005 Remi Collet <[EMAIL PROTECTED]> 2.0.2-1.FC4.remi
+- built for FC4
+- spec cleanning...
+
+* Thu Jun 16 2005 Remi Collet <[EMAIL PROTECTED]> 1.7.40-1.FC3.remi
+- built for FC3 and MySQL 4.1.11
+- examples in /usr/share/doc/mysql++-%%{version}/examples
+
* Sat Apr 30 2005 Warren Young <[EMAIL PROTECTED]> 1.7.34-1
- Split manuals out into their own sub-package.
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
