From c31b43bff1b823d0f1e070106a701e8115cbb656ed5fc935234020cf2b420916 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 2 May 2013 09:20:54 +0000
Subject: [PATCH] Accepting request 174060 from devel:libraries:c_c++

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/174060
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libregf?expand=0&rev=2
---
 libregf.changes |  6 +++++
 libregf.spec    | 58 +++++++++++++++++++++++++------------------------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/libregf.changes b/libregf.changes
index 95172f3..87e86a8 100644
--- a/libregf.changes
+++ b/libregf.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 22 20:09:25 UTC 2013 - Greg.Freemyer@gmail.com
+
+- organize BuildRequires to better comment why they are commented out
+- ran spec-cleaner
+
 -------------------------------------------------------------------
 Wed Apr  3 21:37:14 UTC 2013 - jengelh@inai.de
 
diff --git a/libregf.spec b/libregf.spec
index 688c04f..2f7de8d 100644
--- a/libregf.spec
+++ b/libregf.spec
@@ -27,29 +27,31 @@ Group:          Productivity/File utilities
 Url:            http://code.google.com/p/libregf/
 
 #DL-URL:	http://libregf.googlecode.com/files/libregf-alpha-20130319.tar.gz
-Source:         %name-alpha-%timestamp.tar.xz
+Source:         %{name}-alpha-%timestamp.tar.xz
 Source2:        Windows_NT_Registry_File_(REGF)_format.pdf
 BuildRequires:  pkg-config
 BuildRequires:  python-devel
 BuildRequires:  xz
-#BuildRequires:  pkgconfig(libbfio) >= 20120426
-#BuildRequires:  pkgconfig(libcdata) >= 20120425
+BuildRequires:  pkgconfig(fuse) >= 2.6
+BuildRequires:  pkgconfig(libcnotify) >= 20120425
+BuildRequires:  pkgconfig(libcsplit) >= 20120701
+BuildRequires:  pkgconfig(libfdatetime) >= 20120522
+# Using these packages from factory causes build failures, so use the internal version instead
+#BuildRequires:  pkgconfig(libuna) >= 20120425
+#BuildRequires:  pkgconfig(libfguid) >= 20120426
+#BuildRequires:  pkgconfig(libcpath) >= 20120701
+#BuildRequires:  pkgconfig(libclocale) >= 20120425
 #BuildRequires:  pkgconfig(libcerror) >= 20120425
 #BuildRequires:  pkgconfig(libcfile) >= 20120526
-#BuildRequires:  pkgconfig(libclocale) >= 20120425
-BuildRequires:  pkgconfig(libcnotify) >= 20120425
-#BuildRequires:  pkgconfig(libcpath) >= 20120701
-BuildRequires:  pkgconfig(libcsplit) >= 20120701
+#BuildRequires:  pkgconfig(libbfio) >= 20120426
+#BuildRequires:  pkgconfig(libcdata) >= 20120425
+# These packages are not yet in factory
 #BuildRequires:  pkgconfig(libcstring) >= 20120425
 #BuildRequires:  pkgconfig(libcsystem) >= 20120425
 #BuildRequires:  pkgconfig(libfcache) >= 20120425
 #BuildRequires:  pkgconfig(libfdata) >= 20120425
-BuildRequires:  pkgconfig(libfdatetime) >= 20120522
-#BuildRequires:  pkgconfig(libfguid) >= 20120426
 #BuildRequires:  pkgconfig(libfwnt) >= 20120426
 #BuildRequires:  pkgconfig(libfwsi) >= 20120426
-#BuildRequires:  pkgconfig(libuna) >= 20120425
-BuildRequires:  pkgconfig(fuse) >= 2.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -73,27 +75,27 @@ Group:          Productivity/File utilities
 %description tools
 Several tools for inspecting Windows REGF-type Registry files.
 Typically used for computer forensics.
- 
+
 %package devel
 Summary:        Development files for libregf, a Windows REGF-type Registry file parser
 License:        LGPL-3.0+ and GFDL-1.3+
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %version
+Requires:       %lname = %{version}
 
 %description devel
 libregf is a library to access Windows Registry files of the REGF
 type (a non-text representation).
 
 This subpackage contains libraries and header files for developing
-applications that want to make use of %name.
+applications that want to make use of %{name}.
 
-%package -n python-%name
+%package -n python-%{name}
 Summary:        Python bindings for libregf, a library to access Windows REGF Registry files
 License:        LGPL-3.0+
 Group:          Development/Libraries/Python
 Requires:       python
 
-%description -n python-%name
+%description -n python-%{name}
 libregf is a library to access Windows Registry files of the REGF
 type (a non-text representation).
 
@@ -101,15 +103,15 @@ This subpackage contains the Python bindings for libregf.
 
 %prep
 %setup -qn libregf-%timestamp
-cp "%SOURCE2" .
+cp "%{SOURCE2}" .
 
 %build
 %configure --disable-static --enable-wide-character-type --enable-python
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR="%buildroot"
-find %buildroot -name '*.la' -delete
+%make_install
+find %{buildroot} -name '*.la' -delete
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
@@ -117,23 +119,23 @@ find %buildroot -name '*.la' -delete
 %files -n %lname
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog
-%_libdir/libregf.so.*
+%{_libdir}/libregf.so.*
 
 %files tools
 %defattr(-,root,root)
-%_bindir/regf*
-%_mandir/man1/regf*.1*
+%{_bindir}/regf*
+%{_mandir}/man1/regf*.1*
 
 %files devel
 %defattr(-,root,root)
 %doc Windows_NT_Registry_File*.pdf
-%_includedir/libregf.h
-%_includedir/libregf/
-%_libdir/libregf.so
-%_libdir/pkgconfig/libregf.pc
-%_mandir/man3/libregf.3*
+%{_includedir}/libregf.h
+%{_includedir}/libregf/
+%{_libdir}/libregf.so
+%{_libdir}/pkgconfig/libregf.pc
+%{_mandir}/man3/libregf.3*
 
-%files -n python-%name
+%files -n python-%{name}
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
 %python_sitearch/pyregf.so