diff --git a/jakarta-annotations.spec b/jakarta-annotations.spec
index 65e8e6d..e903945 100644
--- a/jakarta-annotations.spec
+++ b/jakarta-annotations.spec
@@ -1,36 +1,27 @@
-%global srcname common-annotations-api
-
 Name:           jakarta-annotations
 Version:        1.3.5
 Release:        7%{?dist}
 Summary:        Jakarta Annotations
 License:        EPL-2.0 or GPLv2 with exceptions
-
 URL:            https://github.com/eclipse-ee4j/common-annotations-api
-Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
-
 BuildArch:      noarch
 
+Source0:        https://github.com/eclipse-ee4j/common-annotations-api/archive/%{version}/common-annotations-api-%{version}.tar.gz
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.glassfish.build:spec-version-maven-plugin)
 
-# renamed in fedora 33, remove in fedora 35
-Obsoletes:      glassfish-annotation-api < 1.3.5-1
-Provides:       glassfish-annotation-api = %{version}-%{release}
-
 %description
 Jakarta Annotations defines a collection of annotations representing
 common semantic concepts that enable a declarative style of programming
 that applies across a variety of Java technologies.
 
-
-%javadoc_package
-
+%{?javadoc_package}
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n common-annotations-api-%{version}
 
 # remove unnecessary dependency on parent POM
 # org.eclipse.ee4j:project is not packaged and isn't needed
@@ -53,16 +44,13 @@ that applies across a variety of Java technologies.
 %build
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE.md NOTICE.md
 %doc README.md
 
-
 %changelog
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild