diff --git a/libdbi.spec b/libdbi.spec
index 2ba6605..10ca90c 100644
--- a/libdbi.spec
+++ b/libdbi.spec
@@ -15,10 +15,10 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%global flavor @BUILD_FLAVOR@%{nil}
+%global flavor @BUILD_FLAVOR@%nil
 
 %global sname libdbi
-%if "%{flavor}" == "devel-doc"
+%if "%flavor" == "devel-doc"
 %global psuffix -devel-doc
 %endif
 
@@ -27,7 +27,7 @@ Name:           libdbi%{?psuffix}
 Version:        0.9.0.g33
 #Snapshot:	libdbi-0.9.0-33-gcdc4479
 Release:        0
-%if "%{flavor}" == ""
+%if "%flavor" == ""
 Summary:        Database Independent Abstraction Layer for C
 Group:          Development/Libraries/C and C++
 %endif
@@ -36,14 +36,14 @@ URL:            http://libdbi.sourceforge.net/
 
 #Git-Clone:	git://git.code.sf.net/p/libdbi/libdbi
 #Source:         http://downloads.sf.net/libdbi/%%name-%%version.tar.gz
-Source:         %{sname}-%{version}.tar.xz
+Source:         %sname-%version.tar.xz
 Source2:        baselibs.conf
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  xz
-%if "%{flavor}" == "devel-doc"
+%if "%flavor" == "devel-doc"
 # Only needed when doc is not already prebuilt
 BuildRequires:  docbook-dsssl-stylesheets
 BuildRequires:  openjade
@@ -55,10 +55,10 @@ BuildRequires:  tex(wasy10.tfm)
 BuildRequires:  texlive-jadetex
 BuildRequires:  texlive-pdftex-bin
 Recommends:     libdbi-devel = %version
-Provides:       libdbi-devel:%{_docdir}/libdbi/driver-guide.pdf
+Provides:       libdbi-devel:%_docdir/libdbi/driver-guide.pdf
 %endif
 
-%if "%{flavor}" == ""
+%if "%flavor" == ""
 %description
 libdbi implements a database-independent abstraction layer in C,
 similar to the DBI/DBD layer in Perl. Writing one generic set of
@@ -96,37 +96,37 @@ applications with libdbi.
 
 
 %prep
-%setup -qn %{sname}
+%setup -qn %sname
 
 %build
 autoreconf -fi
 sed -i s,\-O20,\-O2,g configure
 %configure \
-%if "%{flavor}" == ""
-  --disable-docs \
+%if "%flavor" == ""
+	--disable-docs \
 %else
-  --enable-docs \
+	--enable-docs \
 %endif
-  --docdir="%{_docdir}/libdbi" \
-  --disable-static
+	--docdir="%_docdir/libdbi" \
+	--disable-static
 
-%if "%{flavor}" == ""
+%if "%flavor" == ""
 %make_build
 %else
 %make_build -C doc
 %endif
 
 %install
-%if "%{flavor}" == ""
+%if "%flavor" == ""
 %make_install
-rm "%{buildroot}/%{_libdir}/libdbi.la"
+rm "%buildroot/%_libdir/libdbi.la"
 
 %else
 %make_install -C doc
 %endif
 
 
-%if "%{flavor}" == ""
+%if "%flavor" == ""
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
@@ -142,9 +142,9 @@ rm "%{buildroot}/%{_libdir}/libdbi.la"
 
 %else
 
-%files -n %{sname}-devel-doc
-%dir %{_docdir}/libdbi
-%{_docdir}/libdbi/*-guide*
+%files -n %sname-devel-doc
+%dir %_docdir/libdbi
+%_docdir/libdbi/*-guide*
 
 %endif