diff --git a/ppl-testsuite.spec b/ppl-testsuite.spec
index 8c2fd35..05009d4 100644
--- a/ppl-testsuite.spec
+++ b/ppl-testsuite.spec
@@ -55,20 +55,20 @@ through its C and C++ interfaces.
 Summary:        Development tools for the Parma Polyhedra Library C and C++ interfaces
 Group:          Development/Libraries/C and C++
 Requires:       gmp-devel >= 4.1.3
-Requires:       libppl%{so_name} = %{version}
-Requires:       libppl_c4 = %{version}
-Recommends:     ppl-doc = %{version}
+Requires:       libppl%so_name = %version
+Requires:       libppl_c4 = %version
+Recommends:     ppl-doc = %version
 
 %description devel
 The header files, Autoconf macro, and ppl-config tool for developing
 applications using the Parma Polyhedra Library through its C and C++
 interfaces.
 
-%package -n libppl%{so_name}
+%package -n libppl%so_name
 Summary:        C++ interface of the Parma Polyhedra Library
 Group:          System/Libraries
 
-%description -n libppl%{so_name}
+%description -n libppl%so_name
 Shared library for the Parma Polyhedra Library.
 
 %package -n libppl_c4
@@ -92,8 +92,8 @@ want to program with the PPL.
 %autosetup -p1 -n ppl-%version
 
 %build
-%if "%{name}" == "ppl-testsuite"
-export CXXFLAGS="%{optflags} -g0"
+%if "%name" == "ppl-testsuite"
+export CXXFLAGS="%optflags -g0"
 %endif
 %configure \
 	--disable-static \
@@ -103,7 +103,7 @@ export CXXFLAGS="%{optflags} -g0"
 #sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
-%if "%{name}" == "ppl-testsuite"
+%if "%name" == "ppl-testsuite"
 %check
 make %{?_smp_mflags} check
 
@@ -115,71 +115,71 @@ make %{?_smp_mflags} check
 %make_install INSTALL="install -p"
 rm -f "%buildroot/%_libdir"/*.la
 # We don't build the binary, so delete its manpage
-rm -f %{buildroot}%{_mandir}/man1/ppl_lpsol.1
+rm -f %buildroot%_mandir/man1/ppl_lpsol.1
 # We don't build pwl
-rm -Rf %{buildroot}%{_datadir}/doc/pwl
+rm -Rf %buildroot%_datadir/doc/pwl
 # The pdf is enough
-rm -f %{buildroot}%{_datadir}/doc/%{name}/ppl-user-*.ps.gz
-rm -f %{buildroot}%{_datadir}/doc/%{name}/ChangeLog
-rm -f %{buildroot}%{_datadir}/doc/%{name}/README.configure
-rm -f %{buildroot}%{_datadir}/doc/%{name}/TODO
-rm -f %{buildroot}%{_datadir}/doc/%{name}/gpl.*
-rm -f %{buildroot}%{_datadir}/doc/%{name}/fdl.ps.gz
-rm -f %{buildroot}%{_datadir}/doc/%{name}/fdl.pdf
-rm -Rf %{buildroot}%{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}*
-rm -Rf %{buildroot}%{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}*
-rm -Rf %{buildroot}%{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}*
+rm -f %buildroot%_datadir/doc/%name/ppl-user-*.ps.gz
+rm -f %buildroot%_datadir/doc/%name/ChangeLog
+rm -f %buildroot%_datadir/doc/%name/README.configure
+rm -f %buildroot%_datadir/doc/%name/TODO
+rm -f %buildroot%_datadir/doc/%name/gpl.*
+rm -f %buildroot%_datadir/doc/%name/fdl.ps.gz
+rm -f %buildroot%_datadir/doc/%name/fdl.pdf
+rm -Rf %buildroot%_datadir/doc/%name/ppl-user-prolog-interface-%{version}*
+rm -Rf %buildroot%_datadir/doc/%name/ppl-user-ocaml-interface-%{version}*
+rm -Rf %buildroot%_datadir/doc/%name/ppl-user-java-interface-%{version}*
 cp -a %_sourcedir/GLS-* "%buildroot/%_datadir/doc/%name/"
 # %%name == ppl
 %endif
-%fdupes -s %{buildroot}
+%fdupes -s %buildroot
 
-%post   -n libppl%{so_name} -p /sbin/ldconfig
-%postun -n libppl%{so_name} -p /sbin/ldconfig
+%post   -n libppl%so_name -p /sbin/ldconfig
+%postun -n libppl%so_name -p /sbin/ldconfig
 %post   -n libppl_c4 -p /sbin/ldconfig
 %postun -n libppl_c4 -p /sbin/ldconfig
 
-%if "%{name}" == "ppl"
+%if "%name" == "ppl"
 %files
-%dir %{_datadir}/doc/%{name}
-%doc %{_datadir}/doc/%{name}/BUGS
-%doc %{_datadir}/doc/%{name}/COPYING
-%doc %{_datadir}/doc/%{name}/CREDITS
-%doc %{_datadir}/doc/%{name}/NEWS
-%doc %{_datadir}/doc/%{name}/README
-%{_bindir}/ppl_lcdd
+%dir %_datadir/doc/%name
+%doc %_datadir/doc/%name/BUGS
+%doc %_datadir/doc/%name/COPYING
+%doc %_datadir/doc/%name/CREDITS
+%doc %_datadir/doc/%name/NEWS
+%doc %_datadir/doc/%name/README
+%_bindir/ppl_lcdd
 %_bindir/ppl_lpsol
-%{_bindir}/ppl_pips
-%{_mandir}/man1/ppl_lcdd.1.gz
-%{_mandir}/man1/ppl_pips.1.gz
+%_bindir/ppl_pips
+%_mandir/man1/ppl_lcdd.1.gz
+%_mandir/man1/ppl_pips.1.gz
 
-%files -n libppl%{so_name}
-%{_libdir}/libppl.so.*
+%files -n libppl%so_name
+%_libdir/libppl.so.*
 
 %files -n libppl_c4
-%{_libdir}/libppl_c.so.*
+%_libdir/libppl_c.so.*
 
 %files devel
-%{_includedir}/ppl.hh
-%{_includedir}/ppl_c.h
-%{_libdir}/libppl.so
-%{_libdir}/libppl_c.so
-%{_bindir}/ppl-config
-%{_mandir}/man1/ppl-config.1.gz
-%{_mandir}/man3/libppl.3.gz
-%{_mandir}/man3/libppl_c.3.gz
-%dir %{_datadir}/aclocal
-%{_datadir}/aclocal/ppl.m4
-%{_datadir}/aclocal/ppl_c.m4
+%_includedir/ppl.hh
+%_includedir/ppl_c.h
+%_libdir/libppl.so
+%_libdir/libppl_c.so
+%_bindir/ppl-config
+%_mandir/man1/ppl-config.1.gz
+%_mandir/man3/libppl.3.gz
+%_mandir/man3/libppl_c.3.gz
+%dir %_datadir/aclocal
+%_datadir/aclocal/ppl.m4
+%_datadir/aclocal/ppl_c.m4
 
 %files doc
-%doc %{_datadir}/doc/%{name}/GLS-*
-%doc %{_datadir}/doc/%{name}/README.doc
-%doc %{_datadir}/doc/%{name}/fdl.txt
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf
+%doc %_datadir/doc/%name/GLS-*
+%doc %_datadir/doc/%name/README.doc
+%doc %_datadir/doc/%name/fdl.txt
+%doc %_datadir/doc/%name/ppl-user-%version-html/
+%doc %_datadir/doc/%name/ppl-user-c-interface-%version-html/
+%doc %_datadir/doc/%name/ppl-user-%version.pdf
+%doc %_datadir/doc/%name/ppl-user-c-interface-%version.pdf
 %endif
 
 %changelog
diff --git a/ppl.spec b/ppl.spec
index 8ad3d23..e5f515f 100644
--- a/ppl.spec
+++ b/ppl.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define so_name 14
+%define sover 14
 Name:           ppl
 Version:        1.2
 Release:        0
@@ -55,20 +55,20 @@ through its C and C++ interfaces.
 Summary:        Development tools for the Parma Polyhedra Library C and C++ interfaces
 Group:          Development/Libraries/C and C++
 Requires:       gmp-devel >= 4.1.3
-Requires:       libppl%{so_name} = %{version}
-Requires:       libppl_c4 = %{version}
-Recommends:     ppl-doc = %{version}
+Requires:       libppl%sover = %version
+Requires:       libppl_c4 = %version
+Recommends:     ppl-doc = %version
 
 %description devel
 The header files, Autoconf macro, and ppl-config tool for developing
 applications using the Parma Polyhedra Library through its C and C++
 interfaces.
 
-%package -n libppl%{so_name}
+%package -n libppl%sover
 Summary:        C++ interface of the Parma Polyhedra Library
 Group:          System/Libraries
 
-%description -n libppl%{so_name}
+%description -n libppl%sover
 Shared library for the Parma Polyhedra Library.
 
 %package -n libppl_c4
@@ -92,8 +92,8 @@ want to program with the PPL.
 %autosetup -p1 -n ppl-%version
 
 %build
-%if "%{name}" == "ppl-testsuite"
-export CXXFLAGS="%{optflags} -g0"
+%if "%name" == "ppl-testsuite"
+export CXXFLAGS="%optflags -g0"
 %endif
 %configure \
 	--disable-static \
@@ -103,7 +103,7 @@ export CXXFLAGS="%{optflags} -g0"
 #sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
-%if "%{name}" == "ppl-testsuite"
+%if "%name" == "ppl-testsuite"
 %check
 make %{?_smp_mflags} check
 
@@ -115,71 +115,71 @@ make %{?_smp_mflags} check
 %make_install INSTALL="install -p"
 rm -f "%buildroot/%_libdir"/*.la
 # We don't build the binary, so delete its manpage
-rm -f %{buildroot}%{_mandir}/man1/ppl_lpsol.1
+rm -f %buildroot/%_mandir/man1/ppl_lpsol.1
 # We don't build pwl
-rm -Rf %{buildroot}%{_datadir}/doc/pwl
+rm -Rf %buildroot/%_datadir/doc/pwl
 # The pdf is enough
-rm -f %{buildroot}%{_datadir}/doc/%{name}/ppl-user-*.ps.gz
-rm -f %{buildroot}%{_datadir}/doc/%{name}/ChangeLog
-rm -f %{buildroot}%{_datadir}/doc/%{name}/README.configure
-rm -f %{buildroot}%{_datadir}/doc/%{name}/TODO
-rm -f %{buildroot}%{_datadir}/doc/%{name}/gpl.*
-rm -f %{buildroot}%{_datadir}/doc/%{name}/fdl.ps.gz
-rm -f %{buildroot}%{_datadir}/doc/%{name}/fdl.pdf
-rm -Rf %{buildroot}%{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}*
-rm -Rf %{buildroot}%{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}*
-rm -Rf %{buildroot}%{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}*
+rm -f %buildroot/%_datadir/doc/%name/ppl-user-*.ps.gz
+rm -f %buildroot/%_datadir/doc/%name/ChangeLog
+rm -f %buildroot/%_datadir/doc/%name/README.configure
+rm -f %buildroot/%_datadir/doc/%name/TODO
+rm -f %buildroot/%_datadir/doc/%name/gpl.*
+rm -f %buildroot/%_datadir/doc/%name/fdl.ps.gz
+rm -f %buildroot/%_datadir/doc/%name/fdl.pdf
+rm -Rf %buildroot/%_datadir/doc/%name/ppl-user-prolog-interface-%{version}*
+rm -Rf %buildroot/%_datadir/doc/%name/ppl-user-ocaml-interface-%{version}*
+rm -Rf %buildroot/%_datadir/doc/%name/ppl-user-java-interface-%{version}*
 cp -a %_sourcedir/GLS-* "%buildroot/%_datadir/doc/%name/"
 # %%name == ppl
 %endif
-%fdupes -s %{buildroot}
+%fdupes -s %buildroot
 
-%post   -n libppl%{so_name} -p /sbin/ldconfig
-%postun -n libppl%{so_name} -p /sbin/ldconfig
+%post   -n libppl%sover -p /sbin/ldconfig
+%postun -n libppl%sover -p /sbin/ldconfig
 %post   -n libppl_c4 -p /sbin/ldconfig
 %postun -n libppl_c4 -p /sbin/ldconfig
 
-%if "%{name}" == "ppl"
+%if "%name" == "ppl"
 %files
-%dir %{_datadir}/doc/%{name}
-%doc %{_datadir}/doc/%{name}/BUGS
-%doc %{_datadir}/doc/%{name}/COPYING
-%doc %{_datadir}/doc/%{name}/CREDITS
-%doc %{_datadir}/doc/%{name}/NEWS
-%doc %{_datadir}/doc/%{name}/README
-%{_bindir}/ppl_lcdd
+%dir %_datadir/doc/%name
+%doc %_datadir/doc/%name/BUGS
+%doc %_datadir/doc/%name/COPYING
+%doc %_datadir/doc/%name/CREDITS
+%doc %_datadir/doc/%name/NEWS
+%doc %_datadir/doc/%name/README
+%_bindir/ppl_lcdd
 %_bindir/ppl_lpsol
-%{_bindir}/ppl_pips
-%{_mandir}/man1/ppl_lcdd.1.gz
-%{_mandir}/man1/ppl_pips.1.gz
+%_bindir/ppl_pips
+%_mandir/man1/ppl_lcdd.1.gz
+%_mandir/man1/ppl_pips.1.gz
 
-%files -n libppl%{so_name}
-%{_libdir}/libppl.so.*
+%files -n libppl%sover
+%_libdir/libppl.so.*
 
 %files -n libppl_c4
-%{_libdir}/libppl_c.so.*
+%_libdir/libppl_c.so.*
 
 %files devel
-%{_includedir}/ppl.hh
-%{_includedir}/ppl_c.h
-%{_libdir}/libppl.so
-%{_libdir}/libppl_c.so
-%{_bindir}/ppl-config
-%{_mandir}/man1/ppl-config.1.gz
-%{_mandir}/man3/libppl.3.gz
-%{_mandir}/man3/libppl_c.3.gz
-%dir %{_datadir}/aclocal
-%{_datadir}/aclocal/ppl.m4
-%{_datadir}/aclocal/ppl_c.m4
+%_includedir/ppl.hh
+%_includedir/ppl_c.h
+%_libdir/libppl.so
+%_libdir/libppl_c.so
+%_bindir/ppl-config
+%_mandir/man1/ppl-config.1.gz
+%_mandir/man3/libppl.3.gz
+%_mandir/man3/libppl_c.3.gz
+%dir %_datadir/aclocal
+%_datadir/aclocal/ppl.m4
+%_datadir/aclocal/ppl_c.m4
 
 %files doc
-%doc %{_datadir}/doc/%{name}/GLS-*
-%doc %{_datadir}/doc/%{name}/README.doc
-%doc %{_datadir}/doc/%{name}/fdl.txt
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}-html/
-%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.pdf
-%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf
+%doc %_datadir/doc/%name/GLS-*
+%doc %_datadir/doc/%name/README.doc
+%doc %_datadir/doc/%name/fdl.txt
+%doc %_datadir/doc/%name/ppl-user-%version-html/
+%doc %_datadir/doc/%name/ppl-user-c-interface-%version-html/
+%doc %_datadir/doc/%name/ppl-user-%version.pdf
+%doc %_datadir/doc/%name/ppl-user-c-interface-%version.pdf
 %endif
 
 %changelog