Hello everybody,

as some of you may know, I have a project in the opensuse build service,
where I had to make some changes to the specfile for Version 5.

You find my diff attached. 

Changes:

- in opensuse  build service, do not build mysql per default

- removed gconsole, as it is not supported in V5 anymore

- removed the patching of 
  src/cats/make_sqlite3_tables.in,  
  src/cats/create_sqlite3_database.in, 
  src/cats/make_catalog_backup.in,
  src/cats/update_sqlite3_tables.in

- copy the examples/sample-query.sql to query.sql, as before, the "query"      
  command had no queries.

- added the files
  %{script_dir}/bacula_config
  %{script_dir}/make_catalog_backup.pl

- I do not build the qt4 libs from scratch, but I get the package from other 
opensuse build project where needed.

The results of the opensuse build service building my spec can be found on

http://download.opensuse.org/repositories/home:/dassit:/bacula:/

any feedback on the packages is appreciated.


best regards,

Philipp

Am Freitag 29 Januar 2010 13:16:20 schrieb Moray Henderson:
> >From: Kern Sibbald [mailto:[email protected]]
> >
> >> RPM build errors:
> >>     Bad owner/group: /builddir/build/SPECS/bacula.spec
> >>
> >>
> >> Any immediate ideas?
> >
> >I have never seen that problem before, but then I always build as
> > non-root, so
> >I don't have permission problems.  It looks like you are working in some
> >sort
> >of chroot setup, which complicates everything -- you probably need to
> >move /etc/passwd, ... into it.  IMO it is much easier to use .rpmmacros to
> >work in your home directory. It takes a few tries to set it up the first
> >time, but after that, it saves using root and possibly wrecking your OS or
> >fiddling with chroots.
> 
> Tracked down that error: the .spec from the tarball is extracted as
>  owner/group 1000, which doesn't exist in my build system.  chowning it
>  back to root sorted that. (Talking about unnecessary complications, my
>  build system uses mock, which is how Fedora think it should be done.)
> 
> Now I'm guessing the paths through all those conditional builds need
>  adjusting (unless it's my build options):
> 
> mock-chroot> rpmbuild -D 'build_centos5 1' -D 'build_sqlite 1' -ba
>  bacula.spec ...
> error: Installed (but unpackaged) file(s) found:
>    /usr/lib/bacula/bacula_config
>    /usr/lib/bacula/make_catalog_backup.pl
> 
> RPM build errors:
>     File listed twice: /etc/bacula/bacula-dir.conf
>     File listed twice: /etc/bacula/bacula-fd.conf
>     File listed twice: /etc/bacula/bacula-sd.conf
>     File listed twice: /etc/bacula/bconsole.conf
>     File listed twice: /etc/bacula/bacula-fd.conf
>     File listed twice: /etc/bacula/bconsole.conf
>     File listed twice: /usr/lib/bacula/updatedb/README
>     File listed twice: /usr/lib/bacula/updatedb/update_bacula_tables_8_to_9
>     File listed twice: /usr/lib/bacula/updatedb/update_bdb_tables_8_to_9
>     File listed twice:
>  /usr/lib/bacula/updatedb/update_mysql_tables_10_to_11 File listed twice:
>  /usr/lib/bacula/updatedb/update_mysql_tables_10_to_11.in File listed
>  twice: /usr/lib/bacula/updatedb/update_mysql_tables_4_to_5 File listed
>  twice: /usr/lib/bacula/updatedb/update_mysql_tables_5_to_6 File listed
>  twice: /usr/lib/bacula/updatedb/update_mysql_tables_6_to_7 File listed
>  twice: /usr/lib/bacula/updatedb/update_mysql_tables_7_to_8 File listed
>  twice: /usr/lib/bacula/updatedb/update_mysql_tables_8_to_9 File listed
>  twice: /usr/lib/bacula/updatedb/update_mysql_tables_9_to_10 File listed
>  twice: /usr/lib/bacula/updatedb/update_mysql_tables_9_to_10.in File listed
>  twice: /usr/lib/bacula/updatedb/update_postgresql_tables_10_to_11 File
>  listed twice:
>  /usr/lib/bacula/updatedb/update_postgresql_tables_10_to_11.in File listed
>  twice: /usr/lib/bacula/updatedb/update_postgresql_tables_7_to_8 File
>  listed twice: /usr/lib/bacula/updatedb/update_postgresql_tables_8_to_9
>  File listed twice:
>  /usr/lib/bacula/updatedb/update_postgresql_tables_9_to_10 File listed
>  twice: /usr/lib/bacula/updatedb/update_postgresql_tables_9_to_10.in File
>  listed twice: /usr/lib/bacula/updatedb/update_sqlite3_tables_10_to_11 File
>  listed twice: /usr/lib/bacula/updatedb/update_sqlite3_tables_10_to_11.in
>  File listed twice: /usr/lib/bacula/updatedb/update_sqlite3_tables_8_to_9
>  File listed twice: /usr/lib/bacula/updatedb/update_sqlite3_tables_9_to_10
>  File listed twice:
>  /usr/lib/bacula/updatedb/update_sqlite3_tables_9_to_10.in File listed
>  twice: /usr/lib/bacula/updatedb/update_sqlite_tables_10_to_11.in File
>  listed twice: /usr/lib/bacula/updatedb/update_sqlite_tables_4_to_5 File
>  listed twice: /usr/lib/bacula/updatedb/update_sqlite_tables_5_to_6 File
>  listed twice: /usr/lib/bacula/updatedb/update_sqlite_tables_6_to_7 File
>  listed twice: /usr/lib/bacula/updatedb/update_sqlite_tables_7_to_8 File
>  listed twice: /usr/lib/bacula/updatedb/update_sqlite_tables_8_to_9 File
>  listed twice: /usr/lib/bacula/updatedb/update_sqlite_tables_9_to_10.in
>  Installed (but unpackaged) file(s) found:
>    /usr/lib/bacula/bacula_config
>    /usr/lib/bacula/make_catalog_backup.pl
> 
> 
> 
> Moray.
> "To err is human.  To purr, feline"
> 
> 
> 
> 
> 
> ---------------------------------------------------------------------------
> --- The Planet: dedicated and managed hosting, cloud storage, colocation
>  Stay online with enterprise data centers and the best network in the
>  business Choose flexible plans and management services without long-term
>  contracts Personal 24x7 support from experience hosting pros just a phone
>  call away. http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Bacula-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/bacula-devel
> 

-- 
  Philipp Storz                               [email protected]
  dass IT GmbH                                 Phone:  +49.221.3565666-92
  http://www.dass-IT.de/                        Fax  : +49.221.3565666-10

  Sitz der Gesellschaft: Köln | Amtsgericht Köln: HRB52500 
  GF: Stephan Dühr, Maik Außendorf, Jörg Steffens, Philipp Storz
GET https://api.opensuse.org/source/home:dassit:bacula/bacula-base?rev=5
GET https://api.opensuse.org/source/home:dassit:bacula/bacula-base/bacula.spec?rev=5
Index: bacula.spec
===================================================================
--- bacula.spec     (revision 5) 
+++ bacula.spec     (working copy) 
@@ -41,7 +41,11 @@
 
 # choose database backend here
 # postgres, mysql, sqlite
-# %define build_mysql 1
+# define build_mysql 1
+
+# as of 5.0.0, gnome console is not supported
+%define nobuild_gconsole 1 
+
 
 # Build Service: Determine Distribution
 
@@ -198,11 +202,11 @@
 # opensuse-bs?
 
 # basic defines for every build
-%define _version 3.0.3
+%define _version 5.0.0
 %define _release 1
 %define depkgs_version 18Dec09
-%define _rescuever 3.0.3
-%define docs_version 3.0.3
+%define _rescuever 5.0.0
+%define docs_version 5.0.0
 
 # any patches for this release
 # be sure to check the setup section for patch macros
@@ -1501,18 +1505,18 @@
 
 # patch the make_sqlite_tables script for installation bindir
 #patch src/cats/make_sqlite_tables.in src/cats/make_sqlite_tables.in.patch
-patch src/cats/make_sqlite3_tables.in src/cats/make_sqlite3_tables.in.patch
+#patch src/cats/make_sqlite3_tables.in src/cats/make_sqlite3_tables.in.patch
 
 # patch the create_sqlite_database script for installation bindir
 #patch src/cats/create_sqlite_database.in src/cats/create_sqlite_database.in.patch
-patch src/cats/create_sqlite3_database.in src/cats/create_sqlite3_database.in.patch
+#patch src/cats/create_sqlite3_database.in src/cats/create_sqlite3_database.in.patch
 
 # patch the make_catalog_backup script for installation bindir
-patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch
+#patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch
 
 # patch the update_sqlite_tables script for installation bindir
 #patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch
-patch src/cats/update_sqlite3_tables.in src/cats/update_sqlite3_tables.in.patch
+#patch src/cats/update_sqlite3_tables.in src/cats/update_sqlite3_tables.in.patch
 
 # patch the bacula-dir init script to remove sqlite service
 %if %{sqlite} && %{su9}
@@ -1898,6 +1902,10 @@
 #cp ../Release_Notes-%{version}-1.txt $RPM_BUILD_ROOT%{_prefix}/doc/
 %endif
 
+# copy examples/sample-query.sql to query.sql
+cp -p examples/sample-query.sql $RPM_BUILD_ROOT%{script_dir}/query.sql
+
+
 # now clean up permissions that are left broken by the install
 chmod o-rwx $RPM_BUILD_ROOT%{working_dir}
 %if %{gconsole} && ! %{rh8}
@@ -1951,7 +1959,6 @@
 %{sqlite_bindir}/libsqlite3.a
 %{sqlite_bindir}/sqlite3.h
 %{sqlite_bindir}/sqlite3
-%{_libdir}/bacula/sqlite
 %endif
 
 %if %{postgresql}
@@ -2386,6 +2393,9 @@
 %{_libdir}/libbacpy.*
 %{_libdir}/libbaccfg.*
 %{_libdir}/libbac.*
+%{script_dir}/bacula_config
+%{script_dir}/make_catalog_backup.pl
+
 
 
 
@@ -2575,6 +2585,10 @@
 
 
 %changelog
+* Fri Jan 29 2010 Philipp Storz <[email protected]>
+- Commented out patches to the create_xxx_database.in skripts
+* Fri Jan 22 2010 Philipp Storz <[email protected]> 
+- Introduced into OpenSuse Build Service
 * Sat May 02 2009 D. Scott Barninger <[email protected]>
 - 3.0.1
 - update for new docs configuration

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Bacula-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bacula-devel

Reply via email to