commit dmapi

27 Jul 2006

Hello community,

here is the log from the commit of package dmapi
checked in at Thu Jul 27 17:55:58 CEST 2006.

--------

--- dmapi/dmapi.changes	2006-01-25 21:35:31.000000000 +0100
+++ dmapi/dmapi.changes	2006-07-27 16:29:48.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jul 27 16:24:03 CEST 2006 - mjancar@suse.cz
+
+- update to 2.2.5
+  * Debian packaging updates (debmake out, debhelper in)
+  * Fix Debian build packaging dependency.
+
+-------------------------------------------------------------------

Old:
----
  dmapi-2.2.3-docdir.diff
  dmapi-2.2.3-include.diff
  dmapi-2.2.3-no_la_in_root.diff
  dmapi-2.2.3.src.tar.bz2

New:
----
  dmapi-2.2.5-1-docdir.diff
  dmapi-2.2.5-1-include.diff
  dmapi-2.2.5-1-no_la_in_root.diff
  dmapi_2.2.5-1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dmapi.spec ++++++
--- /var/tmp/diff_new_pack.5dDYPZ/_old	2006-07-27 17:55:43.000000000 +0200
+++ /var/tmp/diff_new_pack.5dDYPZ/_new	2006-07-27 17:55:43.000000000 +0200
@@ -1,19 +1,20 @@
 #
-# spec file for package dmapi (Version 2.2.3)
+# spec file for package dmapi (Version 2.2.5_1)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
 Name:         dmapi
 BuildRequires: e2fsprogs-devel xfsprogs-devel
-Version:      2.2.3
+Version:        2.2.5_1
 Release:      1
+%define ver   2.2.5-1
 Requires:     xfsprogs
 Conflicts:    xfsdump < 2.0.0
 Prefix:       %{_prefix}
@@ -22,10 +23,10 @@
 License:      GPL
 URL:          http://oss.sgi.com/projects/xfs/
 Summary:      Data Management API Runtime Environment
-Source0:      %{name}-%{version}.src.tar.bz2
-Patch0:       %{name}-%{version}-docdir.diff
-Patch1:       %{name}-%{version}-no_la_in_root.diff
-Patch2:       %{name}-%{version}-include.diff
+Source0:        %{name}_%{ver}.tar.bz2
+Patch0:         %{name}-%{ver}-docdir.diff
+Patch1:         %{name}-%{ver}-no_la_in_root.diff
+Patch2:         %{name}-%{ver}-include.diff
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -62,7 +63,7 @@
     SGI
 
 %prep
-%setup -q
+%setup -q -n %{name}-2.2.5
 %patch0
 %patch1
 %patch2
@@ -96,13 +97,13 @@
 files()
 {
 	sort | uniq | awk '
-$1 == "d" { printf ("%%%%dir %%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $5); }
+$1 == "d" { printf ("%%%%dir %%%%attr(%s,root,root) %s\n", $2, $5); }
 $1 == "f" { if (match ($6, "/usr/share/man") || match ($6, "/usr/share/doc/packages/dmapi"))
 		printf ("%%%%doc ");
             if (match ($6, "/usr/share/man"))
-		printf ("%%%%attr(%s,%s,%s) %s*\n", $2, $3, $4, $6);
+		printf ("%%%%attr(%s,root,root) %s*\n", $2, $6);
 	    else
-		printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); }
+		printf ("%%%%attr(%s,root,root) %s\n", $2, $6); }
 $1 == "l" { if (match ($3, "/usr/share/man") || match ($3, "/usr/share/doc/packages/dmapi"))
 		printf ("%%%%doc ");
 	    if (match ($3, "/usr/share/man"))
@@ -125,11 +126,16 @@
 %run_ldconfig
 
 %files -f files.rpm                                                             
-                                                                                
+%defattr(-,root,root,755)
 
 %files devel -f filesdevel.rpm
+%defattr(-,root,root,755)
 
 %changelog -n dmapi
+* Thu Jul 27 2006 - mjancar@suse.cz
+- update to 2.2.5
+  * Debian packaging updates (debmake out, debhelper in)
+  * Fix Debian build packaging dependency.
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Mon Jan 16 2006 - mjancar@suse.cz

++++++ dmapi-2.2.5-1-docdir.diff ++++++
--- include/builddefs.in
+++ include/builddefs.in
@@ -28,7 +28,7 @@
 PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
 PKG_INC_DIR	= @includedir@/xfs
 PKG_MAN_DIR	= @mandir@
-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+PKG_DOC_DIR	= @datadir@/doc/packages/@pkg_name@
 PKG_LOCALE_DIR	= @datadir@/locale
 
 CC		= @cc@
++++++ dmapi-2.2.5-1-include.diff ++++++
--- include/dmapi.h
+++ include/dmapi.h
@@ -24,7 +24,7 @@
 #endif
 
 #ifndef __KERNEL__
-#include <xfs/xfs.h>
+#include <xfs/libxfs.h>
 #include <xfs/handle.h>
 #endif
 
++++++ dmapi-2.2.5-1-no_la_in_root.diff ++++++
--- include/buildmacros
+++ include/buildmacros
@@ -73,8 +73,6 @@
 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
 else
 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org

    

root＠suse.de

tags

participants (1)