diff --git a/samba.spec b/samba.spec
index b359f95..d28b448 100644
--- a/samba.spec
+++ b/samba.spec
@@ -35,7 +35,7 @@
 %define smbconfmajor 0
 %define smbldapmajor 2
 %define tevent_utilmajor 0
-#%%define pytalloc_utilmajor 2
+#define pytalloc_utilmajor 2
 %define nsswinsmajor 2
 %define winbindmajor 2
 %define sambaerrorsmajor 1
@@ -253,7 +253,7 @@ Requires:	%{name}-winbind = %{EVRD}
 Requires:	python3-%{name} = %{EVRD}
 # distro-type(desktop) is provided by branding-configs
 Recommends:	(%{name}-share-role if distro-type(desktop))
-Requires(pre):	/bin/systemd-sysusers
+Requires(pre):	%{_bindir}/systemd-sysusers
 # samba.service is domain controller
 Provides:	samba = %{EVRD}
 
@@ -309,9 +309,9 @@ Samba also features an AD domain capability.
 %{_mandir}/man8/samba-gpupdate.8*
 %{_mandir}/man8/samba_downgrade_db.8*
 %{_mandir}/man8/samba-bgqd.8*
-%{_unitdir}/samba.service
-%{_unitdir}/smb.service
-%{_unitdir}/nmb.service
+%{_prefix}/lib/systemd/system/samba.service
+%{_prefix}/lib/systemd/system/smb.service
+%{_prefix}/lib/systemd/system/nmb.service
 %{_sysusersdir}/samba-server.conf
 %attr(1770,root,sambashare) %dir %{smb_usershare_dir}
 %config(noreplace) %{_sysconfdir}/sysconfig/samba
@@ -381,7 +381,7 @@ Provides libraries for Samba
 %{_libdir}/samba/service
 %{_libdir}/samba/process_model
 %{_libdir}/samba/gensec
-#%%{_libdir}/samba/auth
+#{_libdir}/samba/auth
 %{_libdir}/samba/libCHARSET3-samba4.so
 %{_libdir}/samba/libMESSAGING-SEND-samba4.so
 %{_libdir}/samba/libHDB-SAMBA4-samba4.so
@@ -443,7 +443,7 @@ Provides libraries for Samba
 %{_libdir}/samba/libkdc-samba4.so
 %{_libdir}/samba/libkrb5-samba4.so
 %{_libdir}/samba/libkrb5samba-samba4.so
-#%%{_libdir}/samba/libldb-cmdline.so - does not build. removed? not configured? to be investigated.
+#{_libdir}/samba/libldb-cmdline.so - does not build. removed? not configured? to be investigated.
 %{_libdir}/samba/libldbsamba-samba4.so
 %{_libdir}/samba/liblibcli-lsa3-samba4.so
 %{_libdir}/samba/liblibcli-netlogon3-samba4.so
@@ -661,7 +661,7 @@ packages of Samba.
 %{_mandir}/man8/vfs_glusterfs_fuse.8*
 %{_mandir}/man8/vfs_gpfs.8*
 %{_mandir}/man8/vfs_media_harmony.8*
-#%%{_mandir}/man8/vfs_netatalk.8*
+#{_mandir}/man8/vfs_netatalk.8*
 %{_mandir}/man8/vfs_offline.8*
 %{_mandir}/man8/vfs_preopen.8*
 %{_mandir}/man8/vfs_readahead.8*
@@ -731,8 +731,8 @@ Provides libraries for winbind daemon and testing tools
 %package winbind
 Summary: 	Samba-winbind daemon, utilities and documentation
 Group:		System/Servers
-Recommends:	%{winbind_krb5_locator}
 Requires:	%{libwinbind}
+Recommends:	%{winbind_krb5_locator}
 
 %description winbind
 Provides the winbind daemon and testing tools to allow authentication
@@ -743,7 +743,7 @@ and group/user enumeration from a Windows or Samba domain controller.
 %{_sbindir}/winbindd
 %{_bindir}/wbinfo
 %attr(-,root,root) %config(noreplace) %{_sysconfdir}/pam.d/system-auth-winbind*
-%{_unitdir}/winbind.service
+%{_prefix}/lib/systemd/system/winbind.service
 %{_sysconfdir}/NetworkManager/dispatcher.d/30-winbind
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/idmap_*.8*
@@ -788,7 +788,7 @@ Requires:	python3-talloc
 Requires:	python3-tevent
 Requires:	python3-tdb
 Requires:	python3-ldb
-Requires:	python3egg(dnspython)
+Requires:	python3dist(dnspython)
 Requires:	ldb-utils
 # old name
 Provides:	samba-python3 = %{EVRD}
@@ -1373,7 +1373,7 @@ the local kerberos library to use the same KDC as samba and winbind use
 # Fedora ships mans in the same package with libraries
 # We can't do that to allow coexisting of 32 and 64 bit libraries in one system
 # So we ship it in samba-common
-#%%{_mandir}/man8/winbind_krb5_locator.8*
+#{_mandir}/man8/winbind_krb5_locator.8*
 
 %postun -n %{winbind_krb5_locator}
 if [ "$1" -ge "1" ]; then
@@ -1438,7 +1438,7 @@ sed -e 's/@ROSA_VENDOR_PATCH@/%{release}/g' -i VERSION
 	--with-acl-support \
 	--with-automount \
 	--with-systemd \
-	--with-systemddir=%{_unitdir} \
+	--with-systemddir=%{_prefix}/lib/systemd/system \
 	--systemd-install-services \
 	--
 
@@ -1509,7 +1509,7 @@ cat >%{buildroot}%{_sysconfdir}/ld.so.conf.d/samba_%{_arch}.conf <<EOF
 %{_libdir}/samba
 EOF
 
-mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system %{buildroot}%{_sysconfdir}/sysconfig
 
 install -m644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
 
@@ -1521,7 +1521,7 @@ install -m 0755 packaging/NetworkManager/30-winbind-systemd %{buildroot}%{_sysco
 install -d -m 0755 %{buildroot}%{_libdir}/krb5/plugins/libkrb5
 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 
-sed -i "s|/usr/bin/kill|$(which kill)|g" %{buildroot}%{_unitdir}/*.service
+sed -i "s|/usr/bin/kill|$(which kill)|g" %{buildroot}%{_prefix}/lib/systemd/system/*.service
 
 # create %{_rundir}/samba too.
 mkdir -p %{buildroot}%{_tmpfilesdir}/