scm-commits October 2011

scm-commits@lists.fedoraproject.org

374 participants
11992 discussions

[xfwm4] Fix release and changelog
by Christoph Wickert 31 Oct '11

31 Oct '11

commit 3e6efbe186f7babe32a26e08b35dd0a83e94c091 Author: Christoph Wickert <cwickert(a)fedoraproject.org> Date: Tue Nov 1 00:59:33 2011 +0100 Fix release and changelog xfwm4.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/xfwm4.spec b/xfwm4.spec index 331b344..3ade016 100644 --- a/xfwm4.spec +++ b/xfwm4.spec @@ -2,7 +2,7 @@ Name: xfwm4 Version: 4.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Next generation window manager for Xfce Group: User Interface/Desktops @@ -98,8 +98,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog -* Tue Nov 01 2011 Christoph Wickert <cwickert(a)fedoraproject.org> - 4.8.3-4 -- Provide window manager for firstboot +* Tue Nov 01 2011 Christoph Wickert <cwickert(a)fedoraproject.org> - 4.8.3-5 +- Provide window manager for firstboot (#750397) * Sat Oct 15 2011 Christoph Wickert <cwickert(a)fedoraproject.org> - 4.8.3-4 - Another patch to fix resizing (#670173)

1 0

[soci/f15] Upstream integration New CMake build system
by Denis Arnaud 31 Oct '11

31 Oct '11

commit 7153ae512d629e97c6b44a134e2c265d0f1e2c2b Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org> Date: Tue Nov 1 00:49:38 2011 +0100 Upstream integration New CMake build system .gitignore | 3 +- soci.spec | 265 ++++++++++++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 163 insertions(+), 107 deletions(-) --- diff --git a/.gitignore b/.gitignore index 30c8f6f..584c1ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ soci-*.tar.* +soci-*.zip soci-*.src.rpm .gitignore clog .build-* -/soci-3.0.0 +/soci-3.?.? /noarch /x86_64 diff --git a/soci.spec b/soci.spec index c72fdad..ceb5434 100644 --- a/soci.spec +++ b/soci.spec @@ -1,13 +1,17 @@ # ## -# Default values are --with mysql --with postgresql --without oracle +# Default values are --with empty --with sqlite3 --with mysql --with postgresql +# --with odbc --without oracle # Note that, for Oracle, when enabled, the following options should # also be given: # --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public # --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib # If the macros are defined, redefine them with the correct compilation flags. +%bcond_without empty +%bcond_without sqlite3 %bcond_without mysql %bcond_without postgresql +%bcond_without odbc %bcond_with oracle %define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1 @@ -17,29 +21,18 @@ ## # Name: soci -Version: 3.0.0 -Release: 23%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: The database access library for C++ programmers Group: System Environment/Libraries License: Boost URL: http://%{name}.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# This issue has been fixed upstream, e.g., see: -# http://soci.git.sourceforge.net/git/gitweb.cgi?p=soci/soci;a=commitdiff;h=9…) -Patch0: %{name}-%{version}-gcc46-compatibility.patch -# This patch is being submitted upstream. A decision about whether and how -# burying headers) should be taken after the release of version 3.1.0): -Patch1: %{name}-%{version}-buried-headers.patch -# Just add standard documentation, from upstream documents: -Patch2: %{name}-%{version}-add-doc.patch -# This patch is temporary, for the 3.0.0 version, as: -# * it allows to build cleanly with the GNU Autotools; -# * whereas upstream now uses CMake. -Patch3: %{name}-%{version}-gnu-autotools-compatibility.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: cmake BuildRequires: boost-devel BuildRequires: libtool @@ -49,46 +42,70 @@ illusion of embedding SQL in regular C++ code, staying entirely within the C++ standard. +%{?with_sqlite3:%package sqlite3 +Summary: SQLite3 back-end for %{name} +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: sqlite-devel + +%description sqlite3 +This package contains the SQLite3 back-end for %{name}, i.e., +dynamic library specific to the SQLite3 database. If you would like to +use %{name} in your programs with SQLite3, you will need to +install %{name}-sqlite3.} + %{?with_mysql:%package mysql Summary: MySQL back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -BuildRequires: mysql-devel >= 5.0 +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: mysql-devel %description mysql -This package contains the MySQL back-end for SOCI, i.e., +This package contains the MySQL back-end for %{name}, i.e., dynamic library specific to the MySQL database. If you would like to -use SOCI in your programs with MySQL, you will need to +use %{name} in your programs with MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql Summary: PostGreSQL back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -BuildRequires: postgresql-devel >= 7.1 +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: postgresql-devel %description postgresql -This package contains the PostGreSQL back-end for SOCI, i.e., +This package contains the PostGreSQL back-end for %{name}, i.e., dynamic library specific to the PostGreSQL database. If you would like -to use SOCI in your programs with PostGreSQL, you will need to +to use %{name} in your programs with PostGreSQL, you will need to install %{name}-postgresql.} +%{?with_odbc:%package odbc +Summary: ODBC back-end for %{name} +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: unixODBC-devel + +%description odbc +This package contains the ODBC back-end for %{name}, i.e., +dynamic library specific to the ODBC connectors. If you would like to +use %{name} in your programs with ODBC, you will need to +install %{name}-odbc.} + %{?with_oracle:%package oracle Summary: Oracle back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description oracle -This package contains the Oracle back-end for SOCI, i.e., +This package contains the Oracle back-end for %{name}, i.e., dynamic library specific to the Oracle database. If you would like to -use SOCI in your programs with Oracle, you will need to install +use %{name} in your programs with Oracle, you will need to install %{name}-oracle.} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -96,12 +113,25 @@ This package contains the header files, dynamic libraries and development documentation for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. +%{?with_sqlite3:%package sqlite3-devel +Summary: SQLite3 back-end for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-sqlite3 = %{version}-%{release} +Requires: sqlite-devel + +%description sqlite3-devel +This package contains the SQLite3 back-end for %{name}, i.e., header +files and dynamic libraries specific to the SQLite3 database. If you +would like to develop programs using %{name} and SQLite3, you will need +to install %{name}-sqlite3.} + %{?with_mysql:%package mysql-devel Summary: MySQL back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-mysql = %{version}-%{release} -Requires: mysql-devel >= 5.0 +Requires: mysql-devel %description mysql-devel This package contains the MySQL back-end for %{name}, i.e., header @@ -114,7 +144,7 @@ Summary: PostGreSQL back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-postgresql = %{version}-%{release} -Requires: postgresql-devel >= 7.1 +Requires: postgresql-devel %description postgresql-devel This package contains the PostGreSQL back-end for %{name}, i.e., header @@ -122,6 +152,19 @@ files and dynamic libraries specific to the PostGreSQL database. If you would like to develop programs using %{name} and PostGreSQL, you will need to install %{name}-postgresql.} +%{?with_odbc:%package odbc-devel +Summary: ODBC back-end for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-odbc = %{version}-%{release} +Requires: unixODBC-devel + +%description odbc-devel +This package contains the Odbc back-end for %{name}, i.e., header +files and dynamic libraries specific to the Odbc database. If you +would like to develop programs using %{name} and Odbc, you will need +to install %{name}-odbc.} + %{?with_oracle:%package oracle-devel Summary: Oracle back-end for %{name} Group: Development/Libraries @@ -135,85 +178,65 @@ would like to develop programs using %{name} and Oracle, you will need to install %{name}-oracle.} -%package doc -Summary: HTML documentation for the SOCI library +%package doc +Summary: HTML documentation for the %{name} library Group: Documentation -%if 0%{?fedora} >= 10 +%if 0%{?fedora} || 0%{?rhel} > 5 BuildArch: noarch -#BuildRequires: texlive-latex, texlive-dvips %endif -#BuildRequires: tetex-latex, tetex-dvips +#BuildRequires: tex(latex) #BuildRequires: doxygen, ghostscript -%description doc -This package contains the documentation in the HTML format of the SOCI -library. The documentation is the same as at the SOCI web page. +%description doc +This package contains the documentation in the HTML format of the %{name} +library. The documentation is the same as at the %{name} web page. %prep %setup -q -# Apply the g++ 4.6 compatibility patch -%patch0 -p1 - # Rename change-log and license file, so that they comply with # packaging standard mv CHANGES ChangeLog mv LICENSE_1_0.txt COPYING -rm -f INSTALL - -# Remove MacOSX compatibility building files -rm -f build/unix/._*.tcl -rm -f ._Makefile ._configure -rm -f src/core/._*.h src/core/._*.cpp -rm -f src/backends/postgresql/._*.h -rm -f doc/._*.html - -# Rename the source code directory, so that the files (e.g, header -# files) can be exported correctly into {_standard_dir}/%%{name} -mv src %{name} - -# Apply the buried headers patch -%patch1 -p1 - -# Add standard documentation -%patch2 -p1 - -# Apply the GNU Autotools compatibility patch -%patch3 -p1 - -# Fix some permissions and formats -find ./doc -type f -perm 755 -exec chmod 644 {} \; -chmod -x AUTHORS ChangeLog COPYING NEWS README -# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; +echo "2011-10-08:" > NEWS +echo "- Version 3.1.0" >> NEWS +echo "- See the ChangeLog file for more details." >> NEWS %build -%configure --disable-static \ -%{?with_mysql:--enable-backend-mysql} \ -%{?with_postgresql:--enable-backend-postgresql} \ -%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} -make %{?_smp_mflags} +# Support for building tests. +%define soci_testflags -DBUILD_TESTS="NONE" +%if %{with tests} + %define soci_testflags -DSOCI_TEST=ON \ + -DSOCI_TEST_EMPTY_CONNSTR="dummy" \ + -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ + -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ + -DSOCI_TEST_MYSQL_CONNSTR:STRING="db=soci_test user=mloskot password=pantera" +%endif + +mkdir tmpbuild +pushd tmpbuild +# -DCMAKE_INSTALL_PREFIX:PATH=$RPM_BUILD_ROOT +%cmake \ + -DSOCI_EMPTY=%{?with_empty:ON}%{?without_empty:OFF} \ + -DSOCI_SQLITE3=%{?with_sqlite3:ON}%{?without_sqlite3:OFF} \ + -DSOCI_POSTGRESQL=%{?with_postgresql:ON}%{?without_postgresql:OFF} \ + -DSOCI_MYSQL=%{?with_mysql:ON}%{?without_mysql:OFF} \ + -DSOCI_ODBC=%{?with_odbc:ON}%{?without_odbc:OFF} \ + -DWITH_ORACLE=%{?with_oracle:ON %{?_with_oracle_incdir} %{?_with_oracle_libdir}}%{?without_oracle:OFF} \ + %{soci_testflags} .. +make VERBOSE=1 %{?_smp_mflags} +popd %install rm -rf $RPM_BUILD_ROOT +pushd tmpbuild make install DESTDIR=$RPM_BUILD_ROOT +popd ## # Remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h -rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la -## -## -# Duplicate the header files, so as to keep the compatibility, for -# developers using the SOCI library, with the non-packaged version of -# that library. -for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do - cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} -done -%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} -%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} -%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} - +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean rm -rf $RPM_BUILD_ROOT @@ -222,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig +%{?with_sqlite3:%post sqlite3 -p /sbin/ldconfig + +%postun sqlite3 -p /sbin/ldconfig} + %{?with_mysql:%post mysql -p /sbin/ldconfig %postun mysql -p /sbin/ldconfig} @@ -230,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT %postun postgresql -p /sbin/ldconfig} +%{?with_odbc:%post odbc -p /sbin/ldconfig + +%postun odbc -p /sbin/ldconfig} + %{?with_oracle:%post oracle -p /sbin/ldconfig %postun oracle -p /sbin/ldconfig} @@ -240,6 +271,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_core.so.* +%{?with_empty:%{_libdir}/lib%{name}_empty.so.*} + +%{?with_sqlite3:%files sqlite3 +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_sqlite3.so.*} %{?with_mysql:%files mysql %defattr(-,root,root,-) @@ -251,6 +288,11 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_postgresql.so.*} +%{?with_odbc:%files odbc +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_odbc.so.*} + %{?with_oracle:%files oracle %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README @@ -260,36 +302,45 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %{_includedir}/%{name} -%dir %{_includedir}/%{name}/core +%dir %{_includedir}/%{name}/ %{_includedir}/%{name}/*.h -%{_includedir}/%{name}/core/*.h -%{_includedir}/%{name}/core/test -%{_bindir}/%{name}-config +%{?with_empty:%{_includedir}/%{name}/empty/} %{_libdir}/lib%{name}_core.so -%{_libdir}/pkgconfig/%{name}.pc -%{_datadir}/aclocal/%{name}.m4 -%{_mandir}/man1/%{name}-config.1.* +%{?with_empty:%{_libdir}/lib%{name}_empty.so} + +%{?with_sqlite3:%files sqlite3-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/sqlite3/ +%{_libdir}/lib%{name}_sqlite3.so} %{?with_mysql:%files mysql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/mysql +%{_includedir}/%{name}/mysql %{_libdir}/lib%{name}_mysql.so} %{?with_postgresql:%files postgresql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/postgresql +%{_includedir}/%{name}/postgresql %{_libdir}/lib%{name}_postgresql.so} +%{?with_odbc:%files odbc-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/odbc/ +%{_libdir}/lib%{name}_odbc.so} + %{?with_oracle:%files oracle-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/oracle +%{_includedir}/%{name}/oracle %{_libdir}/lib%{name}_oracle.so} @@ -299,14 +350,18 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Jul 03 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 3.0.0-23 -- Now links with the multi-threaded versions of the Boost libraries +* Mon Oct 31 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.1.0-1 +- Upstream integration +- New CMake build system + +* Sat Jul 23 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 3.0.0-23 +- Rebuild for Boost-1.47.0-2 -* Mon Apr 25 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.0.0-22 -- Rebuilt for new Boost-1.46.1-2 +* Sun Jul 03 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 3.0.0-22 +- Now links with the multi-threaded versions of the Boost libraries -* Thu Apr 07 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.0.0-21 -- Rebuilt for new Boost-1.46 +* Mon Apr 25 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 3.0.0-21 +- Rebuild for Boost-1.46.1-2 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild @@ -361,7 +416,7 @@ rm -rf $RPM_BUILD_ROOT - Restarted from pristine version 3.0.0 of upstream (SOCI) project * Sat Apr 4 2009 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.0.0-2 -- Specific RPM for each backend +- Specific RPM for each back-end * Fri Mar 27 2009 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.0.0-1 - First RPM release diff --git a/sources b/sources index 291c586..aaf62f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bf7dd244764e53557c1ecc01fdfac96 soci-3.0.0.tar.gz +6ffac090b996bc34aedf4a29adf4595c soci-3.1.0.zip

1 0

[xfwm4] Provide window manager for firstboot
by Christoph Wickert 31 Oct '11

31 Oct '11

commit b645e46f5f3a8729409203571208112fd981a1bd Author: Christoph Wickert <cwickert(a)fedoraproject.org> Date: Tue Nov 1 00:48:16 2011 +0100 Provide window manager for firstboot xfwm4.spec | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) --- diff --git a/xfwm4.spec b/xfwm4.spec index 085de48..331b344 100644 --- a/xfwm4.spec +++ b/xfwm4.spec @@ -31,6 +31,7 @@ BuildRequires: libglade2-devel BuildRequires: libwnck-devel BuildRequires: xfconf-devel >= %{xfceversion} BuildRequires: desktop-file-utils +Provides: firstboot(windowmanager) = xfwm4 # FIXME #Requires: xfce4-doc @@ -97,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Nov 01 2011 Christoph Wickert <cwickert(a)fedoraproject.org> - 4.8.3-4 +- Provide window manager for firstboot + * Sat Oct 15 2011 Christoph Wickert <cwickert(a)fedoraproject.org> - 4.8.3-4 - Another patch to fix resizing (#670173)

1 0

[soci/f16] Fixed the sources file.
by Denis Arnaud 31 Oct '11

31 Oct '11

commit e90d11c95f396d2c8b419bff520304a3b712b679 Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org> Date: Tue Nov 1 00:32:46 2011 +0100 Fixed the sources file. sources | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/sources b/sources index 291c586..aaf62f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bf7dd244764e53557c1ecc01fdfac96 soci-3.0.0.tar.gz +6ffac090b996bc34aedf4a29adf4595c soci-3.1.0.zip

1 0

[parted] - Fix ped_disk_duplicate on GPT so that it copies the partition flags (#747947) - Add new test to ch
by Brian C. Lane 31 Oct '11

31 Oct '11

commit 68bb9e0f50b412907950d8553baccde7e225c32c Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Oct 31 14:56:09 2011 -0700 - Fix ped_disk_duplicate on GPT so that it copies the partition flags (#747947) - Add new test to check ped_disk_duplicate on msdos, gpt, bsd disk labels - Add e2fsprogs and dosfstools so that skipped tests will be run ...opy-flags-when-duplicating-GPT-partitions.patch | 53 +++++ ...-add-new-test-to-check-ped_disk_duplicate.patch | 210 ++++++++++++++++++++ parted.spec | 12 +- 3 files changed, 274 insertions(+), 1 deletions(-) --- diff --git a/parted-3.0-libparted-copy-flags-when-duplicating-GPT-partitions.patch b/parted-3.0-libparted-copy-flags-when-duplicating-GPT-partitions.patch new file mode 100644 index 0000000..4ab8b6f --- /dev/null +++ b/parted-3.0-libparted-copy-flags-when-duplicating-GPT-partitions.patch @@ -0,0 +1,53 @@ +From e356e46263c93f0ffdcd830d9f4d051fc961067e Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" <bcl(a)redhat.com> +Date: Thu, 27 Oct 2011 16:29:15 -0700 +Subject: [PATCH 1/2] libparted: copy flags when duplicating GPT partitions + + * libparted/labels/gpt.c (gpt_partition_duplicate): copy flags to new + partition. + * NEWS: Mention this fix. +--- + NEWS | 3 +++ + libparted/labels/gpt.c | 12 ++++++++++++ + 2 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/NEWS b/NEWS +index b7fb56b..915b5ff 100644 +--- a/NEWS ++++ b/NEWS +@@ -8,6 +8,9 @@ GNU parted NEWS -*- outline -*- + + ** Bug fixes + ++ libparted: gpt_disk_duplicate now copies the flags over to the new ++ disk object. Previously the flags would be undefined. ++ + libparted: no longer aborts (failed assertion) due to a nilfs2_probe bug + [bug introduced in parted-2.4 with the addition of nilfs2 support] + +diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c +index 8c9816f..7b4e014 100644 +--- a/libparted/labels/gpt.c ++++ b/libparted/labels/gpt.c +@@ -1365,6 +1365,18 @@ gpt_partition_duplicate (const PedPartition *part) + result_data->type = part_data->type; + result_data->uuid = part_data->uuid; + strcpy (result_data->name, part_data->name); ++ ++ /* Copy over all the flags */ ++ result_data->lvm = part_data->lvm; ++ result_data->raid = part_data->raid; ++ result_data->boot = part_data->boot; ++ result_data->bios_grub = part_data->bios_grub; ++ result_data->hp_service = part_data->hp_service; ++ result_data->hidden = part_data->hidden; ++ result_data->msftres = part_data->msftres; ++ result_data->atvrecv = part_data->atvrecv; ++ result_data->msftrecv = part_data->msftrecv; ++ result_data->legacy_boot = part_data->legacy_boot; + return result; + + error_free_part: +-- +1.7.6.4 + diff --git a/parted-3.0-tests-add-new-test-to-check-ped_disk_duplicate.patch b/parted-3.0-tests-add-new-test-to-check-ped_disk_duplicate.patch new file mode 100644 index 0000000..00c05e4 --- /dev/null +++ b/parted-3.0-tests-add-new-test-to-check-ped_disk_duplicate.patch @@ -0,0 +1,210 @@ +From 1fad3afd9587de566b2f3b451ed4de2fc409ad21 Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" <bcl(a)redhat.com> +Date: Mon, 31 Oct 2011 14:30:12 -0700 +Subject: [PATCH 2/2] tests: add new test to check ped_disk_duplicate + + * tests/duplicate.c: New test + * tests/t0501-duplicate.sh: New test program + * tests/Makefile.am (TEST): Add new test + (check_PROGRAMS): Add new test program +--- + tests/Makefile.am | 3 +- + tests/duplicate.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++ + tests/t0501-duplicate.sh | 28 ++++++++++ + 3 files changed, 159 insertions(+), 1 deletions(-) + create mode 100644 tests/duplicate.c + create mode 100644 tests/t0501-duplicate.sh + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 5a8a539..ae4c5f4 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -24,6 +24,7 @@ TESTS = \ + t0300-dos-on-gpt.sh \ + t0400-loop-clobber-infloop.sh \ + t0500-dup-clobber.sh \ ++ t0501-duplicate.sh \ + t1100-busy-label.sh \ + t1101-busy-partition.sh \ + t1700-probe-fs.sh \ +@@ -62,7 +63,7 @@ EXTRA_DIST = \ + $(TESTS) lvm-utils.sh t-local.sh t-lvm.sh \ + init.cfg init.sh t-lib-helpers.sh + +-check_PROGRAMS = print-align print-max dup-clobber ++check_PROGRAMS = print-align print-max dup-clobber duplicate + LDADD = \ + $(top_builddir)/libparted/libparted.la + AM_CPPFLAGS = \ +diff --git a/tests/duplicate.c b/tests/duplicate.c +new file mode 100644 +index 0000000..5af8543 +--- /dev/null ++++ b/tests/duplicate.c +@@ -0,0 +1,129 @@ ++/* Demonstrate that ped_disk_duplicate is working correctly. ++*/ ++#include <config.h> ++#include <parted/parted.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <assert.h> ++#include <sys/types.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <string.h> ++ ++#include "closeout.h" ++#include "progname.h" ++ ++int ++main (int argc, char **argv) ++{ ++ atexit (close_stdout); ++ set_program_name (argv[0]); ++ ++ if (argc != 2) ++ return EXIT_FAILURE; ++ ++ char const *dev_name = "dev-file"; ++ ++ /* Create a file. */ ++ int fd = open (dev_name, O_CREAT|O_TRUNC|O_WRONLY, 0644); ++ assert (0 <= fd); ++ off_t size = 8 * 1024 * 1024; ++ assert (ftruncate (fd, size) == 0); ++ assert (close (fd) == 0); ++ ++ PedDevice *dev = ped_device_get (dev_name); ++ assert (dev); ++ ++ PedDisk *disk = ped_disk_new_fresh (dev, ped_disk_type_get (argv[1])); ++ assert (disk); ++ assert (ped_disk_commit(disk)); ++ ped_disk_destroy (disk); ++ ++ /* re-open the disk */ ++ disk = ped_disk_new (dev); ++ assert (disk); ++ ++ /* Create a partition */ ++ const PedFileSystemType *fs_type = ped_file_system_type_get ("ext2"); ++ assert (fs_type); ++ PedPartitionType part_type = PED_PARTITION_NORMAL; ++ const PedGeometry *geometry = ped_geometry_new (dev, 34, 1024); ++ assert (geometry); ++ PedPartition *part = ped_partition_new (disk, part_type, fs_type, geometry->start, geometry->end); ++ assert (part); ++ PedConstraint *constraint = ped_constraint_exact (geometry); ++ assert (constraint); ++ ++ if (ped_partition_is_flag_available (part, PED_PARTITION_BOOT)) ++ assert (ped_partition_set_flag (part, PED_PARTITION_BOOT, 1)); ++ ++ assert (ped_disk_add_partition (disk, part, constraint)); ++ ped_constraint_destroy (constraint); ++ ++ assert (ped_partition_set_system (part, fs_type)); ++ if (ped_partition_is_flag_available (part, PED_PARTITION_LBA)) ++ ped_partition_set_flag (part, PED_PARTITION_LBA, 1); ++ ++ assert (ped_disk_commit(disk)); ++ ++ /* Duplicate it */ ++ PedDisk *copy = ped_disk_duplicate (disk); ++ assert (ped_disk_commit(copy)); ++ ++ /* Compare the two copies */ ++ ++ /* Check the device */ ++ assert (strcmp (disk->dev->model, copy->dev->model) == 0); ++ assert (strcmp (disk->dev->path, copy->dev->path) == 0); ++ assert (disk->dev->sector_size == copy->dev->sector_size); ++ assert (disk->dev->phys_sector_size == copy->dev->phys_sector_size); ++ assert (disk->dev->length == copy->dev->length); ++ ++ /* Check the type */ ++ assert (strcmp (disk->type->name, copy->type->name) == 0); ++ assert (disk->type->features == copy->type->features); ++ ++ /* Check the flags */ ++ for (PedDiskFlag flag = PED_DISK_FIRST_FLAG; flag <= PED_DISK_LAST_FLAG; flag++) { ++ if (!ped_disk_is_flag_available(disk, flag)) ++ continue; ++ assert (ped_disk_get_flag (disk, flag) == ped_disk_get_flag (copy, flag)); ++ } ++ ++ /* Check the partitions */ ++ PedPartition *disk_part, *copy_part; ++ for ( disk_part = disk->part_list, copy_part = copy->part_list; ++ disk_part && copy_part; ++ disk_part = disk_part->next, copy_part = copy_part->next) ++ { ++ /* Only active partitions are duplicated */ ++ if (!ped_partition_is_active (disk_part)) ++ continue; ++ ++ assert (disk_part->geom.start == copy_part->geom.start); ++ assert (disk_part->geom.end == copy_part->geom.end); ++ assert (disk_part->geom.length == copy_part->geom.length); ++ assert (disk_part->num == copy_part->num); ++ assert (disk_part->type == copy_part->type); ++ ++ if (disk_part->fs_type && disk_part->fs_type->name) { ++ assert (strcmp (disk_part->fs_type->name, copy_part->fs_type->name) == 0); ++ } ++ ++ /* Check the flags */ ++ for (PedPartitionFlag flag = PED_PARTITION_FIRST_FLAG; flag <= PED_PARTITION_LAST_FLAG; flag++) { ++ if (!ped_partition_is_flag_available(disk_part, flag)) ++ continue; ++ fprintf (stderr, "Checking partition flag %d\n", flag); ++ fprintf (stderr, "%d ? %d\n", ped_partition_get_flag (disk_part, flag), ped_partition_get_flag (copy_part, flag)); ++ assert (ped_partition_get_flag (disk_part, flag) == ped_partition_get_flag (copy_part, flag)); ++ } ++ } ++ ++ /* Cleanup the mess */ ++ ped_disk_destroy (copy); ++ ped_disk_destroy (disk); ++ ped_device_destroy (dev); ++ ++ return EXIT_SUCCESS; ++} +diff --git a/tests/t0501-duplicate.sh b/tests/t0501-duplicate.sh +new file mode 100644 +index 0000000..0585a95 +--- /dev/null ++++ b/tests/t0501-duplicate.sh +@@ -0,0 +1,28 @@ ++#!/bin/sh ++# Drive the dup-clobber program. ++ ++# Copyright (C) 2011 Free Software Foundation, Inc. ++ ++# This program 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. ++ ++# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. ++ ++. "${srcdir=.}/init.sh"; path_prepend_ ../parted ++ ++PATH="..:$PATH" ++export PATH ++ ++for t in msdos gpt bsd; do ++ duplicate $t || fail=1 ++done ++ ++Exit $fail +-- +1.7.6.4 + diff --git a/parted.spec b/parted.spec index efddf4a..59abb90 100644 --- a/parted.spec +++ b/parted.spec @@ -4,7 +4,7 @@ Summary: The GNU disk partition manipulation program Name: parted Version: 3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Group: Applications/System URL: http://www.gnu.org/software/parted @@ -30,6 +30,9 @@ Patch9: parted-3.0-tests-test-for-the-nilfs2-bug.patch Patch10: parted-3.0-libparted-Fix-a-bug-in-the-hfs-probe-functions-71475.patch Patch11: parted-3.0-libparted-make-pc98-detection-depend-on-signatures.patch Patch12: parted-3.0-tests-add-tests-for-new-pc98-signatures-646053.patch +Patch13: parted-3.0-libparted-copy-flags-when-duplicating-GPT-partitions.patch +Patch14: parted-3.0-tests-add-new-test-to-check-ped_disk_duplicate.patch + Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: e2fsprogs-devel @@ -44,6 +47,8 @@ BuildRequires: libblkid-devel >= 2.17 BuildRequires: gnupg BuildRequires: git BuildRequires: autoconf automake +BuildRequires: e2fsprogs +BuildRequires: dosfstools Requires(post): /sbin/ldconfig Requires(post): /sbin/install-info @@ -158,6 +163,11 @@ fi %changelog +* Mon Oct 31 2011 Brian C. Lane <bcl(a)redht.com> - 3.0-4 +- Fix ped_disk_duplicate on GPT so that it copies the partition flags (#747947) +- Add new test to check ped_disk_duplicate on msdos, gpt, bsd disk labels +- Add e2fsprogs and dosfstools so that skipped tests will be run + * Fri Oct 07 2011 Brian C. Lane <bcl(a)redhat.com> - 3.0-3 - Fix handling of zero-length gpt partitions (#728949) - Fix bug in nilfs2 probe with short partitions (#728949)

1 0

[soci/f16] Upstream integration New CMake build system
by Denis Arnaud 31 Oct '11

31 Oct '11

commit 9856ea231798165e99f85155f2b9c3d24112b50d Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org> Date: Tue Nov 1 00:19:55 2011 +0100 Upstream integration New CMake build system .gitignore | 3 +- soci.spec | 253 ++++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 156 insertions(+), 100 deletions(-) --- diff --git a/.gitignore b/.gitignore index 30c8f6f..584c1ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ soci-*.tar.* +soci-*.zip soci-*.src.rpm .gitignore clog .build-* -/soci-3.0.0 +/soci-3.?.? /noarch /x86_64 diff --git a/soci.spec b/soci.spec index 37da7d7..ceb5434 100644 --- a/soci.spec +++ b/soci.spec @@ -1,13 +1,17 @@ # ## -# Default values are --with mysql --with postgresql --without oracle +# Default values are --with empty --with sqlite3 --with mysql --with postgresql +# --with odbc --without oracle # Note that, for Oracle, when enabled, the following options should # also be given: # --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public # --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib # If the macros are defined, redefine them with the correct compilation flags. +%bcond_without empty +%bcond_without sqlite3 %bcond_without mysql %bcond_without postgresql +%bcond_without odbc %bcond_with oracle %define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1 @@ -17,29 +21,18 @@ ## # Name: soci -Version: 3.0.0 -Release: 23%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: The database access library for C++ programmers Group: System Environment/Libraries License: Boost URL: http://%{name}.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# This issue has been fixed upstream, e.g., see: -# http://soci.git.sourceforge.net/git/gitweb.cgi?p=soci/soci;a=commitdiff;h=9…) -Patch0: %{name}-%{version}-gcc46-compatibility.patch -# This patch is being submitted upstream. A decision about whether and how -# burying headers) should be taken after the release of version 3.1.0): -Patch1: %{name}-%{version}-buried-headers.patch -# Just add standard documentation, from upstream documents: -Patch2: %{name}-%{version}-add-doc.patch -# This patch is temporary, for the 3.0.0 version, as: -# * it allows to build cleanly with the GNU Autotools; -# * whereas upstream now uses CMake. -Patch3: %{name}-%{version}-gnu-autotools-compatibility.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: cmake BuildRequires: boost-devel BuildRequires: libtool @@ -49,46 +42,70 @@ illusion of embedding SQL in regular C++ code, staying entirely within the C++ standard. +%{?with_sqlite3:%package sqlite3 +Summary: SQLite3 back-end for %{name} +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: sqlite-devel + +%description sqlite3 +This package contains the SQLite3 back-end for %{name}, i.e., +dynamic library specific to the SQLite3 database. If you would like to +use %{name} in your programs with SQLite3, you will need to +install %{name}-sqlite3.} + %{?with_mysql:%package mysql Summary: MySQL back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -BuildRequires: mysql-devel >= 5.0 +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: mysql-devel %description mysql -This package contains the MySQL back-end for SOCI, i.e., +This package contains the MySQL back-end for %{name}, i.e., dynamic library specific to the MySQL database. If you would like to -use SOCI in your programs with MySQL, you will need to +use %{name} in your programs with MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql Summary: PostGreSQL back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -BuildRequires: postgresql-devel >= 7.1 +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: postgresql-devel %description postgresql -This package contains the PostGreSQL back-end for SOCI, i.e., +This package contains the PostGreSQL back-end for %{name}, i.e., dynamic library specific to the PostGreSQL database. If you would like -to use SOCI in your programs with PostGreSQL, you will need to +to use %{name} in your programs with PostGreSQL, you will need to install %{name}-postgresql.} +%{?with_odbc:%package odbc +Summary: ODBC back-end for %{name} +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: unixODBC-devel + +%description odbc +This package contains the ODBC back-end for %{name}, i.e., +dynamic library specific to the ODBC connectors. If you would like to +use %{name} in your programs with ODBC, you will need to +install %{name}-odbc.} + %{?with_oracle:%package oracle Summary: Oracle back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description oracle -This package contains the Oracle back-end for SOCI, i.e., +This package contains the Oracle back-end for %{name}, i.e., dynamic library specific to the Oracle database. If you would like to -use SOCI in your programs with Oracle, you will need to install +use %{name} in your programs with Oracle, you will need to install %{name}-oracle.} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -96,12 +113,25 @@ This package contains the header files, dynamic libraries and development documentation for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. +%{?with_sqlite3:%package sqlite3-devel +Summary: SQLite3 back-end for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-sqlite3 = %{version}-%{release} +Requires: sqlite-devel + +%description sqlite3-devel +This package contains the SQLite3 back-end for %{name}, i.e., header +files and dynamic libraries specific to the SQLite3 database. If you +would like to develop programs using %{name} and SQLite3, you will need +to install %{name}-sqlite3.} + %{?with_mysql:%package mysql-devel Summary: MySQL back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-mysql = %{version}-%{release} -Requires: mysql-devel >= 5.0 +Requires: mysql-devel %description mysql-devel This package contains the MySQL back-end for %{name}, i.e., header @@ -114,7 +144,7 @@ Summary: PostGreSQL back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-postgresql = %{version}-%{release} -Requires: postgresql-devel >= 7.1 +Requires: postgresql-devel %description postgresql-devel This package contains the PostGreSQL back-end for %{name}, i.e., header @@ -122,6 +152,19 @@ files and dynamic libraries specific to the PostGreSQL database. If you would like to develop programs using %{name} and PostGreSQL, you will need to install %{name}-postgresql.} +%{?with_odbc:%package odbc-devel +Summary: ODBC back-end for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-odbc = %{version}-%{release} +Requires: unixODBC-devel + +%description odbc-devel +This package contains the Odbc back-end for %{name}, i.e., header +files and dynamic libraries specific to the Odbc database. If you +would like to develop programs using %{name} and Odbc, you will need +to install %{name}-odbc.} + %{?with_oracle:%package oracle-devel Summary: Oracle back-end for %{name} Group: Development/Libraries @@ -135,85 +178,65 @@ would like to develop programs using %{name} and Oracle, you will need to install %{name}-oracle.} -%package doc -Summary: HTML documentation for the SOCI library +%package doc +Summary: HTML documentation for the %{name} library Group: Documentation -%if 0%{?fedora} >= 10 +%if 0%{?fedora} || 0%{?rhel} > 5 BuildArch: noarch -#BuildRequires: texlive-latex, texlive-dvips %endif -#BuildRequires: tetex-latex, tetex-dvips +#BuildRequires: tex(latex) #BuildRequires: doxygen, ghostscript -%description doc -This package contains the documentation in the HTML format of the SOCI -library. The documentation is the same as at the SOCI web page. +%description doc +This package contains the documentation in the HTML format of the %{name} +library. The documentation is the same as at the %{name} web page. %prep %setup -q -# Apply the g++ 4.6 compatibility patch -%patch0 -p1 - # Rename change-log and license file, so that they comply with # packaging standard mv CHANGES ChangeLog mv LICENSE_1_0.txt COPYING -rm -f INSTALL - -# Remove MacOSX compatibility building files -rm -f build/unix/._*.tcl -rm -f ._Makefile ._configure -rm -f src/core/._*.h src/core/._*.cpp -rm -f src/backends/postgresql/._*.h -rm -f doc/._*.html - -# Rename the source code directory, so that the files (e.g, header -# files) can be exported correctly into {_standard_dir}/%%{name} -mv src %{name} - -# Apply the buried headers patch -%patch1 -p1 - -# Add standard documentation -%patch2 -p1 - -# Apply the GNU Autotools compatibility patch -%patch3 -p1 - -# Fix some permissions and formats -find ./doc -type f -perm 755 -exec chmod 644 {} \; -chmod -x AUTHORS ChangeLog COPYING NEWS README -# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; +echo "2011-10-08:" > NEWS +echo "- Version 3.1.0" >> NEWS +echo "- See the ChangeLog file for more details." >> NEWS %build -%configure --disable-static \ -%{?with_mysql:--enable-backend-mysql} \ -%{?with_postgresql:--enable-backend-postgresql} \ -%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} -make %{?_smp_mflags} +# Support for building tests. +%define soci_testflags -DBUILD_TESTS="NONE" +%if %{with tests} + %define soci_testflags -DSOCI_TEST=ON \ + -DSOCI_TEST_EMPTY_CONNSTR="dummy" \ + -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ + -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ + -DSOCI_TEST_MYSQL_CONNSTR:STRING="db=soci_test user=mloskot password=pantera" +%endif + +mkdir tmpbuild +pushd tmpbuild +# -DCMAKE_INSTALL_PREFIX:PATH=$RPM_BUILD_ROOT +%cmake \ + -DSOCI_EMPTY=%{?with_empty:ON}%{?without_empty:OFF} \ + -DSOCI_SQLITE3=%{?with_sqlite3:ON}%{?without_sqlite3:OFF} \ + -DSOCI_POSTGRESQL=%{?with_postgresql:ON}%{?without_postgresql:OFF} \ + -DSOCI_MYSQL=%{?with_mysql:ON}%{?without_mysql:OFF} \ + -DSOCI_ODBC=%{?with_odbc:ON}%{?without_odbc:OFF} \ + -DWITH_ORACLE=%{?with_oracle:ON %{?_with_oracle_incdir} %{?_with_oracle_libdir}}%{?without_oracle:OFF} \ + %{soci_testflags} .. +make VERBOSE=1 %{?_smp_mflags} +popd %install rm -rf $RPM_BUILD_ROOT +pushd tmpbuild make install DESTDIR=$RPM_BUILD_ROOT +popd ## # Remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h -rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la -## -## -# Duplicate the header files, so as to keep the compatibility, for -# developers using the SOCI library, with the non-packaged version of -# that library. -for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do - cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} -done -%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} -%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} -%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} - +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean rm -rf $RPM_BUILD_ROOT @@ -222,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig +%{?with_sqlite3:%post sqlite3 -p /sbin/ldconfig + +%postun sqlite3 -p /sbin/ldconfig} + %{?with_mysql:%post mysql -p /sbin/ldconfig %postun mysql -p /sbin/ldconfig} @@ -230,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT %postun postgresql -p /sbin/ldconfig} +%{?with_odbc:%post odbc -p /sbin/ldconfig + +%postun odbc -p /sbin/ldconfig} + %{?with_oracle:%post oracle -p /sbin/ldconfig %postun oracle -p /sbin/ldconfig} @@ -240,6 +271,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_core.so.* +%{?with_empty:%{_libdir}/lib%{name}_empty.so.*} + +%{?with_sqlite3:%files sqlite3 +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_sqlite3.so.*} %{?with_mysql:%files mysql %defattr(-,root,root,-) @@ -251,6 +288,11 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_postgresql.so.*} +%{?with_odbc:%files odbc +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_odbc.so.*} + %{?with_oracle:%files oracle %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README @@ -260,36 +302,45 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %{_includedir}/%{name} -%dir %{_includedir}/%{name}/core +%dir %{_includedir}/%{name}/ %{_includedir}/%{name}/*.h -%{_includedir}/%{name}/core/*.h -%{_includedir}/%{name}/core/test -%{_bindir}/%{name}-config +%{?with_empty:%{_includedir}/%{name}/empty/} %{_libdir}/lib%{name}_core.so -%{_libdir}/pkgconfig/%{name}.pc -%{_datadir}/aclocal/%{name}.m4 -%{_mandir}/man1/%{name}-config.1.* +%{?with_empty:%{_libdir}/lib%{name}_empty.so} + +%{?with_sqlite3:%files sqlite3-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/sqlite3/ +%{_libdir}/lib%{name}_sqlite3.so} %{?with_mysql:%files mysql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/mysql +%{_includedir}/%{name}/mysql %{_libdir}/lib%{name}_mysql.so} %{?with_postgresql:%files postgresql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/postgresql +%{_includedir}/%{name}/postgresql %{_libdir}/lib%{name}_postgresql.so} +%{?with_odbc:%files odbc-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/odbc/ +%{_libdir}/lib%{name}_odbc.so} + %{?with_oracle:%files oracle-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/oracle +%{_includedir}/%{name}/oracle %{_libdir}/lib%{name}_oracle.so} @@ -299,6 +350,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 31 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.1.0-1 +- Upstream integration +- New CMake build system + * Sat Jul 23 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 3.0.0-23 - Rebuild for Boost-1.47.0-2 @@ -361,7 +416,7 @@ rm -rf $RPM_BUILD_ROOT - Restarted from pristine version 3.0.0 of upstream (SOCI) project * Sat Apr 4 2009 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.0.0-2 -- Specific RPM for each backend +- Specific RPM for each back-end * Fri Mar 27 2009 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.0.0-1 - First RPM release

1 0

[mono-zeroconf] Change paths for mono assemblies according to updated packaging guidelines (http://fedoraproject.org
by Christian Krause 31 Oct '11

31 Oct '11

commit 88225d1a20d2e307d47842a2f0ff256cdc52404b Author: Christian Krause <chkr(a)fedoraproject.org> Date: Tue Nov 1 00:08:45 2011 +0100 Change paths for mono assemblies according to updated packaging guidelines (http://fedoraproject.org/wiki/Packaging:Mono) mono-zeroconf.spec | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) --- diff --git a/mono-zeroconf.spec b/mono-zeroconf.spec index f8bc7e1..92036ee 100644 --- a/mono-zeroconf.spec +++ b/mono-zeroconf.spec @@ -2,13 +2,12 @@ Name: mono-zeroconf Version: 0.9.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Mono.Zeroconf networking library Group: Development/Languages License: MIT URL: http://banshee-project.org/files/mono-zeroconf Source0: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel monodoc-devel Requires: mono-core @@ -29,36 +28,35 @@ Development files and documentation for Mono.Zeroconf %prep %setup -q -# https://bugzilla.novell.com/show_bug.cgi?id=549163 -sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure.ac -sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure %build -%configure --disable-mdnsresponder +%configure --disable-mdnsresponder --libdir=%{_prefix}/lib #parallel build doesn't work make %install -%{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install - -%clean -%{__rm} -rf %{buildroot} +mkdir -p %{buildroot}%{_libdir}/pkgconfig +test "%{_libdir}" = "%{_prefix}/lib" || mv %{buildroot}%{_prefix}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ %files %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog NEWS README %{_bindir}/mzclient -%{_libdir}/mono-zeroconf/ -%{_libdir}/mono/gac/Mono.Zeroconf -%{_libdir}/mono/mono-zeroconf -%{_libdir}/mono/gac/policy.* +%{_prefix}/lib/mono-zeroconf/ +%{_prefix}/lib/mono/gac/Mono.Zeroconf +%{_prefix}/lib/mono/mono-zeroconf +%{_prefix}/lib/mono/gac/policy.* %files devel %{_libdir}/pkgconfig/mono-zeroconf.pc -%{_libdir}/monodoc/sources/mono-zeroconf* +%{_prefix}/lib/monodoc/sources/mono-zeroconf* %changelog +* Tue Nov 01 2011 Christian Krause <chkr(a)fedoraproject.org> - 0.9.0-6 +- Change paths for mono assemblies according to updated packaging + guidelines (http://fedoraproject.org/wiki/Packaging:Mono) + * Fri Feb 25 2011 Dan Horák <dan[at]danny.cz> - 0.9.0-5 - updated the supported arch list

1 0

[soci] Removed deprecated patches.
by Denis Arnaud 31 Oct '11

31 Oct '11

commit efd925473cdd6db681d7281bd54a908875c4b569 Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org> Date: Tue Nov 1 00:08:30 2011 +0100 Removed deprecated patches. soci-3.0.0-add-doc.patch | 389 - soci-3.0.0-buried-headers.patch | 536 - soci-3.0.0-gcc46-compatibility.patch | 145 - soci-3.0.0-gnu-autotools-compatibility.patch |61175 -------------------------- 4 files changed, 0 insertions(+), 62245 deletions(-)

1 0

[soci] Upstream integration New CMake build system
by Denis Arnaud 31 Oct '11

31 Oct '11

commit 20250e3f58313ee094c6ae08ec43b7bdd25a063a Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org> Date: Tue Nov 1 00:06:29 2011 +0100 Upstream integration New CMake build system .gitignore | 3 +- soci.spec | 253 ++++++++++++++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 157 insertions(+), 101 deletions(-) --- diff --git a/.gitignore b/.gitignore index 30c8f6f..584c1ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ soci-*.tar.* +soci-*.zip soci-*.src.rpm .gitignore clog .build-* -/soci-3.0.0 +/soci-3.?.? /noarch /x86_64 diff --git a/soci.spec b/soci.spec index 37da7d7..ceb5434 100644 --- a/soci.spec +++ b/soci.spec @@ -1,13 +1,17 @@ # ## -# Default values are --with mysql --with postgresql --without oracle +# Default values are --with empty --with sqlite3 --with mysql --with postgresql +# --with odbc --without oracle # Note that, for Oracle, when enabled, the following options should # also be given: # --with-oracle-include=/opt/oracle/app/oracle/product/11.1.0/db_1/rdbms/public # --with-oracle-lib=/opt/oracle/app/oracle/product/11.1.0/db_1/lib # If the macros are defined, redefine them with the correct compilation flags. +%bcond_without empty +%bcond_without sqlite3 %bcond_without mysql %bcond_without postgresql +%bcond_without odbc %bcond_with oracle %define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1 @@ -17,29 +21,18 @@ ## # Name: soci -Version: 3.0.0 -Release: 23%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: The database access library for C++ programmers Group: System Environment/Libraries License: Boost URL: http://%{name}.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# This issue has been fixed upstream, e.g., see: -# http://soci.git.sourceforge.net/git/gitweb.cgi?p=soci/soci;a=commitdiff;h=9…) -Patch0: %{name}-%{version}-gcc46-compatibility.patch -# This patch is being submitted upstream. A decision about whether and how -# burying headers) should be taken after the release of version 3.1.0): -Patch1: %{name}-%{version}-buried-headers.patch -# Just add standard documentation, from upstream documents: -Patch2: %{name}-%{version}-add-doc.patch -# This patch is temporary, for the 3.0.0 version, as: -# * it allows to build cleanly with the GNU Autotools; -# * whereas upstream now uses CMake. -Patch3: %{name}-%{version}-gnu-autotools-compatibility.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: cmake BuildRequires: boost-devel BuildRequires: libtool @@ -49,46 +42,70 @@ illusion of embedding SQL in regular C++ code, staying entirely within the C++ standard. +%{?with_sqlite3:%package sqlite3 +Summary: SQLite3 back-end for %{name} +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: sqlite-devel + +%description sqlite3 +This package contains the SQLite3 back-end for %{name}, i.e., +dynamic library specific to the SQLite3 database. If you would like to +use %{name} in your programs with SQLite3, you will need to +install %{name}-sqlite3.} + %{?with_mysql:%package mysql Summary: MySQL back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -BuildRequires: mysql-devel >= 5.0 +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: mysql-devel %description mysql -This package contains the MySQL back-end for SOCI, i.e., +This package contains the MySQL back-end for %{name}, i.e., dynamic library specific to the MySQL database. If you would like to -use SOCI in your programs with MySQL, you will need to +use %{name} in your programs with MySQL, you will need to install %{name}-mysql.} %{?with_postgresql:%package postgresql Summary: PostGreSQL back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -BuildRequires: postgresql-devel >= 7.1 +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: postgresql-devel %description postgresql -This package contains the PostGreSQL back-end for SOCI, i.e., +This package contains the PostGreSQL back-end for %{name}, i.e., dynamic library specific to the PostGreSQL database. If you would like -to use SOCI in your programs with PostGreSQL, you will need to +to use %{name} in your programs with PostGreSQL, you will need to install %{name}-postgresql.} +%{?with_odbc:%package odbc +Summary: ODBC back-end for %{name} +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: unixODBC-devel + +%description odbc +This package contains the ODBC back-end for %{name}, i.e., +dynamic library specific to the ODBC connectors. If you would like to +use %{name} in your programs with ODBC, you will need to +install %{name}-odbc.} + %{?with_oracle:%package oracle Summary: Oracle back-end for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description oracle -This package contains the Oracle back-end for SOCI, i.e., +This package contains the Oracle back-end for %{name}, i.e., dynamic library specific to the Oracle database. If you would like to -use SOCI in your programs with Oracle, you will need to install +use %{name} in your programs with Oracle, you will need to install %{name}-oracle.} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -96,12 +113,25 @@ This package contains the header files, dynamic libraries and development documentation for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. +%{?with_sqlite3:%package sqlite3-devel +Summary: SQLite3 back-end for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-sqlite3 = %{version}-%{release} +Requires: sqlite-devel + +%description sqlite3-devel +This package contains the SQLite3 back-end for %{name}, i.e., header +files and dynamic libraries specific to the SQLite3 database. If you +would like to develop programs using %{name} and SQLite3, you will need +to install %{name}-sqlite3.} + %{?with_mysql:%package mysql-devel Summary: MySQL back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-mysql = %{version}-%{release} -Requires: mysql-devel >= 5.0 +Requires: mysql-devel %description mysql-devel This package contains the MySQL back-end for %{name}, i.e., header @@ -114,7 +144,7 @@ Summary: PostGreSQL back-end for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-postgresql = %{version}-%{release} -Requires: postgresql-devel >= 7.1 +Requires: postgresql-devel %description postgresql-devel This package contains the PostGreSQL back-end for %{name}, i.e., header @@ -122,6 +152,19 @@ files and dynamic libraries specific to the PostGreSQL database. If you would like to develop programs using %{name} and PostGreSQL, you will need to install %{name}-postgresql.} +%{?with_odbc:%package odbc-devel +Summary: ODBC back-end for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-odbc = %{version}-%{release} +Requires: unixODBC-devel + +%description odbc-devel +This package contains the Odbc back-end for %{name}, i.e., header +files and dynamic libraries specific to the Odbc database. If you +would like to develop programs using %{name} and Odbc, you will need +to install %{name}-odbc.} + %{?with_oracle:%package oracle-devel Summary: Oracle back-end for %{name} Group: Development/Libraries @@ -135,85 +178,65 @@ would like to develop programs using %{name} and Oracle, you will need to install %{name}-oracle.} -%package doc -Summary: HTML documentation for the SOCI library +%package doc +Summary: HTML documentation for the %{name} library Group: Documentation -%if 0%{?fedora} >= 10 +%if 0%{?fedora} || 0%{?rhel} > 5 BuildArch: noarch -#BuildRequires: texlive-latex, texlive-dvips %endif -#BuildRequires: tetex-latex, tetex-dvips +#BuildRequires: tex(latex) #BuildRequires: doxygen, ghostscript -%description doc -This package contains the documentation in the HTML format of the SOCI -library. The documentation is the same as at the SOCI web page. +%description doc +This package contains the documentation in the HTML format of the %{name} +library. The documentation is the same as at the %{name} web page. %prep %setup -q -# Apply the g++ 4.6 compatibility patch -%patch0 -p1 - # Rename change-log and license file, so that they comply with # packaging standard mv CHANGES ChangeLog mv LICENSE_1_0.txt COPYING -rm -f INSTALL - -# Remove MacOSX compatibility building files -rm -f build/unix/._*.tcl -rm -f ._Makefile ._configure -rm -f src/core/._*.h src/core/._*.cpp -rm -f src/backends/postgresql/._*.h -rm -f doc/._*.html - -# Rename the source code directory, so that the files (e.g, header -# files) can be exported correctly into {_standard_dir}/%%{name} -mv src %{name} - -# Apply the buried headers patch -%patch1 -p1 - -# Add standard documentation -%patch2 -p1 - -# Apply the GNU Autotools compatibility patch -%patch3 -p1 - -# Fix some permissions and formats -find ./doc -type f -perm 755 -exec chmod 644 {} \; -chmod -x AUTHORS ChangeLog COPYING NEWS README -# find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; +echo "2011-10-08:" > NEWS +echo "- Version 3.1.0" >> NEWS +echo "- See the ChangeLog file for more details." >> NEWS %build -%configure --disable-static \ -%{?with_mysql:--enable-backend-mysql} \ -%{?with_postgresql:--enable-backend-postgresql} \ -%{?with_oracle:--enable-backend-oracle %{?_with_oracle_incdir} %{?_with_oracle_libdir}} -make %{?_smp_mflags} +# Support for building tests. +%define soci_testflags -DBUILD_TESTS="NONE" +%if %{with tests} + %define soci_testflags -DSOCI_TEST=ON \ + -DSOCI_TEST_EMPTY_CONNSTR="dummy" \ + -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ + -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ + -DSOCI_TEST_MYSQL_CONNSTR:STRING="db=soci_test user=mloskot password=pantera" +%endif + +mkdir tmpbuild +pushd tmpbuild +# -DCMAKE_INSTALL_PREFIX:PATH=$RPM_BUILD_ROOT +%cmake \ + -DSOCI_EMPTY=%{?with_empty:ON}%{?without_empty:OFF} \ + -DSOCI_SQLITE3=%{?with_sqlite3:ON}%{?without_sqlite3:OFF} \ + -DSOCI_POSTGRESQL=%{?with_postgresql:ON}%{?without_postgresql:OFF} \ + -DSOCI_MYSQL=%{?with_mysql:ON}%{?without_mysql:OFF} \ + -DSOCI_ODBC=%{?with_odbc:ON}%{?without_odbc:OFF} \ + -DWITH_ORACLE=%{?with_oracle:ON %{?_with_oracle_incdir} %{?_with_oracle_libdir}}%{?without_oracle:OFF} \ + %{soci_testflags} .. +make VERBOSE=1 %{?_smp_mflags} +popd %install rm -rf $RPM_BUILD_ROOT +pushd tmpbuild make install DESTDIR=$RPM_BUILD_ROOT +popd ## # Remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h -rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}_*.la -## -## -# Duplicate the header files, so as to keep the compatibility, for -# developers using the SOCI library, with the non-packaged version of -# that library. -for header_file in $RPM_BUILD_ROOT%{_includedir}/%{name}/core/*.h; do - cp ${header_file} $RPM_BUILD_ROOT%{_includedir}/%{name} -done -%{?with_mysql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/mysql/soci-mysql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} -%{?with_postgresql:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/postgresql/soci-postgresql.h $RPM_BUILD_ROOT%{_includedir}/%{name}} -%{?with_oracle:cp $RPM_BUILD_ROOT%{_includedir}/%{name}/backends/oracle/soci-oracle.h $RPM_BUILD_ROOT%{_includedir}/%{name}} - +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean rm -rf $RPM_BUILD_ROOT @@ -222,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig +%{?with_sqlite3:%post sqlite3 -p /sbin/ldconfig + +%postun sqlite3 -p /sbin/ldconfig} + %{?with_mysql:%post mysql -p /sbin/ldconfig %postun mysql -p /sbin/ldconfig} @@ -230,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT %postun postgresql -p /sbin/ldconfig} +%{?with_odbc:%post odbc -p /sbin/ldconfig + +%postun odbc -p /sbin/ldconfig} + %{?with_oracle:%post oracle -p /sbin/ldconfig %postun oracle -p /sbin/ldconfig} @@ -240,6 +271,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_core.so.* +%{?with_empty:%{_libdir}/lib%{name}_empty.so.*} + +%{?with_sqlite3:%files sqlite3 +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_sqlite3.so.*} %{?with_mysql:%files mysql %defattr(-,root,root,-) @@ -251,6 +288,11 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/lib%{name}_postgresql.so.*} +%{?with_odbc:%files odbc +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/lib%{name}_odbc.so.*} + %{?with_oracle:%files oracle %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README @@ -260,36 +302,45 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %{_includedir}/%{name} -%dir %{_includedir}/%{name}/core +%dir %{_includedir}/%{name}/ %{_includedir}/%{name}/*.h -%{_includedir}/%{name}/core/*.h -%{_includedir}/%{name}/core/test -%{_bindir}/%{name}-config +%{?with_empty:%{_includedir}/%{name}/empty/} %{_libdir}/lib%{name}_core.so -%{_libdir}/pkgconfig/%{name}.pc -%{_datadir}/aclocal/%{name}.m4 -%{_mandir}/man1/%{name}-config.1.* +%{?with_empty:%{_libdir}/lib%{name}_empty.so} + +%{?with_sqlite3:%files sqlite3-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/sqlite3/ +%{_libdir}/lib%{name}_sqlite3.so} %{?with_mysql:%files mysql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/mysql +%{_includedir}/%{name}/mysql %{_libdir}/lib%{name}_mysql.so} %{?with_postgresql:%files postgresql-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/postgresql +%{_includedir}/%{name}/postgresql %{_libdir}/lib%{name}_postgresql.so} +%{?with_odbc:%files odbc-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/odbc/ +%{_libdir}/lib%{name}_odbc.so} + %{?with_oracle:%files oracle-devel %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_includedir}/%{name} -%{_includedir}/%{name}/backends/oracle +%{_includedir}/%{name}/oracle %{_libdir}/lib%{name}_oracle.so} @@ -299,6 +350,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 31 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.1.0-1 +- Upstream integration +- New CMake build system + * Sat Jul 23 2011 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 3.0.0-23 - Rebuild for Boost-1.47.0-2 @@ -361,7 +416,7 @@ rm -rf $RPM_BUILD_ROOT - Restarted from pristine version 3.0.0 of upstream (SOCI) project * Sat Apr 4 2009 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.0.0-2 -- Specific RPM for each backend +- Specific RPM for each back-end * Fri Mar 27 2009 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 3.0.0-1 - First RPM release diff --git a/sources b/sources index 291c586..aaf62f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bf7dd244764e53557c1ecc01fdfac96 soci-3.0.0.tar.gz +6ffac090b996bc34aedf4a29adf4595c soci-3.1.0.zip

1 0

File soci-3.1.0.zip uploaded to lookaside cache by denisarnaud
by Denis Arnaud 31 Oct '11

31 Oct '11

A file has been added to the lookaside cache for soci: 6ffac090b996bc34aedf4a29adf4595c soci-3.1.0.zip

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits October 2011